X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FScheduler.cc;h=c7a568bf921da9e82aae2764f780a2f5e859bacb;hb=refs%2Fheads%2Fmaster;hp=1f946436454a664a4c7f400d981a672380143fcb;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/Scheduler.cc b/senf/Scheduler/Scheduler.cc
index 1f94643..c7a568b 100644
--- a/senf/Scheduler/Scheduler.cc
+++ b/senf/Scheduler/Scheduler.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Scheduler non-inline non-template implementation
@@ -37,7 +42,7 @@
 // Custom includes
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     bool terminate_ (false);
@@ -51,7 +56,7 @@ prefix_ void senf::scheduler::terminate()
 
 prefix_ void senf::scheduler::yield()
 {
-    senf::scheduler::detail::FIFORunner::instance().yield();
+    detail::FIFORunner::instance().yield();
 }
 
 prefix_ bool senf::scheduler::running()
@@ -65,12 +70,12 @@ prefix_ senf::ClockService::clock_type senf::scheduler::now()
 }
 
 namespace {
-    
+
     // We don't want try { } catch(...) { ... throw; } since that will make debugging more
     // difficult: the stack backtrace for an unexpected exception would always end here.
     struct SchedulerScopedInit
     {
-        SchedulerScopedInit() 
+        SchedulerScopedInit()
             {
                 senf::scheduler::detail::FIFORunner::instance().startWatchdog();
                 senf::scheduler::detail::SignalDispatcher::instance().unblockSignals();
@@ -126,7 +131,7 @@ prefix_ void senf::scheduler::restart()
     fdd->~FdDispatcher();
     ffr->~FIFORunner();
     fdm->~FdManager();
-    
+
     new (fdm) detail::FdManager();
     new (ffr) detail::FIFORunner();
     new (fdd) detail::FdDispatcher();
@@ -139,7 +144,7 @@ prefix_ void senf::scheduler::restart()
 
 prefix_ bool senf::scheduler::empty()
 {
-    return detail::FdDispatcher::instance().empty() 
+    return detail::FdDispatcher::instance().empty()
         && detail::TimerDispatcher::instance().empty()
         && detail::FileDispatcher::instance().empty()
         && detail::SignalDispatcher::instance().empty()
@@ -149,7 +154,7 @@ prefix_ bool senf::scheduler::empty()
 
 prefix_ void senf::scheduler::hiresTimers()
 {
-#ifdef HAVE_TIMERFD
+#ifdef HAVE_TIMERFD_CREATE
     if (haveScalableHiresTimers())
         detail::TimerDispatcher::instance().timerSource(
             std::auto_ptr<detail::TimerSource>(new detail::TimerFDTimerSource()));
@@ -159,16 +164,16 @@ prefix_ void senf::scheduler::hiresTimers()
             std::auto_ptr<detail::TimerSource>(new detail::POSIXTimerSource()));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::schedulerLogTimeSource
 
 prefix_ senf::log::time_type senf::scheduler::LogTimeSource::operator()()
     const
 {
-    return senf::scheduler::now();
+    return senf::ClockService::in_nanoseconds( scheduler::now());
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::scheduler::BlockSignals
 
 prefix_ senf::scheduler::BlockSignals::BlockSignals(bool initiallyBlocked)
@@ -195,7 +200,7 @@ prefix_ void senf::scheduler::BlockSignals::unblock()
     blocked_ = false;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_