X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FFIFORunner.cc;h=2b54eb6dc30d075421c4631c76825037bc3769e4;hb=04b5fd6be72efd504de15a215a268f8b82f4d132;hp=0e5d5beb5c6436a0a25f063f1b83eadc965c9358;hpb=db007c39287e3c666dd6b53edc8c3404617c7dd5;p=senf.git

diff --git a/Scheduler/FIFORunner.cc b/Scheduler/FIFORunner.cc
index 0e5d5be..2b54eb6 100644
--- a/Scheduler/FIFORunner.cc
+++ b/Scheduler/FIFORunner.cc
@@ -36,7 +36,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ senf::scheduler::FIFORunner::FIFORunner()
+prefix_ senf::scheduler::detail::FIFORunner::FIFORunner()
     : tasks_ (), next_ (tasks_.end()), watchdogMs_ (1000), watchdogCount_(0), hangCount_ (0)
 {
     struct sigevent ev;
@@ -61,7 +61,7 @@ prefix_ senf::scheduler::FIFORunner::FIFORunner()
         SENF_THROW_SYSTEM_EXCEPTION("sigprocmask()");
 }
 
-prefix_ senf::scheduler::FIFORunner::~FIFORunner()
+prefix_ senf::scheduler::detail::FIFORunner::~FIFORunner()
 {
     timer_delete(watchdogId_);
     signal(SIGURG, SIG_DFL);
@@ -89,7 +89,7 @@ prefix_ senf::scheduler::FIFORunner::~FIFORunner()
 // will mostly be localized to the end of the queue. only occasionally one of the dormant tasks will
 // be runnable. This additional traversal time will be amortized over a larger time.
 
-prefix_ void senf::scheduler::FIFORunner::dequeue(TaskInfo * task)
+prefix_ void senf::scheduler::detail::FIFORunner::dequeue(TaskInfo * task)
 {
     TaskList::iterator i (TaskList::current(*task));
     if (next_ == i)
@@ -99,14 +99,14 @@ prefix_ void senf::scheduler::FIFORunner::dequeue(TaskInfo * task)
 
 namespace {
     struct NullTask 
-        : public senf::scheduler::FIFORunner::TaskInfo
+        : public senf::scheduler::detail::FIFORunner::TaskInfo
     {
-        NullTask() : senf::scheduler::FIFORunner::TaskInfo ("<null>") {}
+        NullTask() : senf::scheduler::detail::FIFORunner::TaskInfo ("<null>") {}
         void run() {};
     };
 }
 
-prefix_ void senf::scheduler::FIFORunner::run()
+prefix_ void senf::scheduler::detail::FIFORunner::run()
 {
     // This algorithm is carefully adjusted to make it work even when arbitrary tasks are removed
     // from the queue
@@ -131,11 +131,11 @@ prefix_ void senf::scheduler::FIFORunner::run()
             SENF_THROW_SYSTEM_EXCEPTION("timer_settime()");
         while (next_ != end) {
             TaskInfo & task (*next_);
-            if (task.runnable) {
-                task.runnable = false;
-                runningName_ = task.name;
+            if (task.runnable_) {
+                task.runnable_ = false;
+                runningName_ = task.name_;
 #           ifdef SENF_DEBUG
-                runningBacktrace_ = task.backtrace;
+                runningBacktrace_ = task.backtrace_;
 #           endif
                 TaskList::iterator i (next_);
                 ++ next_;
@@ -169,7 +169,7 @@ prefix_ void senf::scheduler::FIFORunner::run()
     next_ = tasks_.end();
 }
 
-prefix_ void senf::scheduler::FIFORunner::watchdog(int, siginfo_t * si, void *)
+prefix_ void senf::scheduler::detail::FIFORunner::watchdog(int, siginfo_t * si, void *)
 {
     FIFORunner & runner (*static_cast<FIFORunner *>(si->si_value.sival_ptr));
     if (runner.watchdogCount_ > 0) {