// 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>
#endif
// 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
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;
}
}