X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FFIFORunner.cc;h=94009c32e9de87e06f90bfa1ae9c780e3323ba04;hb=fe5837b37f112fdcd379e96ce248ca5b5f8b4d98;hp=9908e91d176fefa2365f17ccaaf0f246e74f855d;hpb=b9bc7df8121501f84f5a48e854ebaa4984a44932;p=senf.git

diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc
index 9908e91..94009c3 100644
--- a/senf/Scheduler/FIFORunner.cc
+++ b/senf/Scheduler/FIFORunner.cc
@@ -29,12 +29,11 @@
 // Custom includes
 #include <signal.h>
 #include <time.h>
-#include <boost/lambda/lambda.hpp>
+#include <cassert>
 #include <senf/Utils/Exception.hh>
 #include <senf/Utils/senfassert.hh>
-#include <senf/Utils/ScopeExit.hh>
 #ifdef SENF_DEBUG
-	#include <execinfo.h>
+    #include <execinfo.h>
 #endif
 #include <senf/config.hh>
 #include <stdint.h>
@@ -114,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
@@ -192,31 +191,37 @@ prefix_ void senf::scheduler::detail::FIFORunner::run(TaskList::iterator f, Task
     TaskList::iterator end (TaskList::current(null));
     next_ = f;
 
-    using namespace boost::lambda;
-    ScopeExit atExit ((
-                          var(watchdogCount_) = 0,
-                          var(next_) = l
-                     ));
-
-    while (next_ != end) {
-        TaskInfo & task (*next_);
-        if (task.runnable_) {
-            task.runnable_ = false;
-            runningName_ = task.name();
-#       ifdef SENF_DEBUG
-            runningBacktrace_ = task.backtrace_;
-#       endif
-            TaskList::iterator i (next_);
-            ++ next_;
-            tasks_.splice(l, tasks_, i);
-            watchdogCount_ = 1;
-            yield_ = false;
-            task.run();
-            if (yield_)
-                return;
+    // Would prefer to use ScopeExit+boost::lambda here instead of try but profiling has shown that
+    // to be to costly here
+
+    try {
+        while (next_ != end) {
+            TaskInfo & task (*next_);
+            if (task.runnable_) {
+                task.runnable_ = false;
+                runningName_ = task.name();
+    #       ifdef SENF_DEBUG
+                runningBacktrace_ = task.backtrace_;
+    #       endif
+                TaskList::iterator i (next_);
+                ++ next_;
+                tasks_.splice(l, tasks_, i);
+                watchdogCount_ = 1;
+                yield_ = false;
+                task.run();
+                if (yield_)
+                    return;
+            }
+            else
+                ++ next_;
         }
-        else
-            ++ next_;
+        watchdogCount_ = 0;
+        next_ = l;
+    }
+    catch (...) {
+        watchdogCount_ = 0;
+        next_ = l;
+        throw;
     }
 }
 
@@ -224,11 +229,11 @@ prefix_ senf::scheduler::detail::FIFORunner::TaskList::iterator
 senf::scheduler::detail::FIFORunner::priorityEnd(TaskInfo::Priority p)
 {
     switch (p) {
-    case senf::scheduler::detail::FIFORunner::TaskInfo::PRIORITY_LOW :
+    case TaskInfo::PRIORITY_LOW :
         return tasks_.end();
-    case senf::scheduler::detail::FIFORunner::TaskInfo::PRIORITY_NORMAL :
+    case TaskInfo::PRIORITY_NORMAL :
         return TaskList::current(normalPriorityEnd_);
-    case senf::scheduler::detail::FIFORunner::TaskInfo::PRIORITY_HIGH :
+    case TaskInfo::PRIORITY_HIGH :
         return TaskList::current(highPriorityEnd_);
     }
     return tasks_.begin();