Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Scheduler / FIFORunner.cc

diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc
index 783a98d..85e98e3 100644 (file)
--- a/senf/Scheduler/FIFORunner.cc
+++ b/senf/Scheduler/FIFORunner.cc
@@ -29,6 +29,7 @@
 // Custom includes
 #include <signal.h>
 #include <time.h>
+#include <cassert>
 #include <senf/Utils/Exception.hh>
 #include <senf/Utils/senfassert.hh>
 #ifdef SENF_DEBUG
@@ -41,7 +42,7 @@
 
 //#include "FIFORunner.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::scheduler::detail::FIFORunner::FIFORunner()
     : tasks_ (), next_ (tasks_.end()), watchdogRunning_ (false), watchdogMs_ (1000),
@@ -112,7 +113,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::stopWatchdog()
 // At the moment, the FIFORunner is not very efficient with many non-runnable tasks since the
 // complete list of tasks is traversed on each run().
 //
-// To optimize this, we woould need a way to find the relative ordering of two tasks in O(1) (at the
+// To optimize this, we would need a way to find the relative ordering of two tasks in O(1) (at the
 // moment, this is an O(N) operation by traversing the list).
 //
 // One idea is, to give each task an 'order' value. Whenever a task is added at the end, it's order
@@ -215,11 +216,11 @@ prefix_ void senf::scheduler::detail::FIFORunner::run(TaskList::iterator f, Task
                 ++ next_;
         }
         watchdogCount_ = 0;
-        next_ = 0;
+        next_ = l;
     }
     catch (...) {
         watchdogCount_ = 0;
-        next_ = 0;
+        next_ = l;
         throw;
     }
 }
@@ -252,10 +253,6 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdog(int, siginfo_t * si,
 
 prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
 {
-    static char const hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-                                'a', 'b', 'c', 'd', 'e', 'f' };
-    static void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
-
     // We don't care if the write commands below fail, we just give our best to inform the user
     senf::IGNORE( write(1, "\n\n*** Scheduler task hanging (pid ",34) );
     static char pid[7];
@@ -266,6 +263,9 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
     senf::IGNORE( write(1, runningName_.c_str(), runningName_.size()) );
     senf::IGNORE( write(1, " at\n ", 3) );
 #ifdef SENF_DEBUG
+    static char const hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                                'a', 'b', 'c', 'd', 'e', 'f' };
+    static void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
     unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
     for (unsigned i (0); i < nEntries; ++i) {
         senf::IGNORE( write(1, " 0x", 3) );
@@ -287,7 +287,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
         assert(false);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "FIFORunner.mpp"