X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FFIFORunner.cc;h=a6fb824aa8be3d061285f19df8ad9b2a091236b0;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=2b54eb6dc30d075421c4631c76825037bc3769e4;hpb=ac90835cbb00ca83a51ab9efb23fdcb75518e808;p=senf.git diff --git a/Scheduler/FIFORunner.cc b/Scheduler/FIFORunner.cc index 2b54eb6..a6fb824 100644 --- a/Scheduler/FIFORunner.cc +++ b/Scheduler/FIFORunner.cc @@ -29,15 +29,18 @@ // Custom includes #include #include +#include #include "../Utils/Exception.hh" #include "../Utils/senfassert.hh" +#include "../Utils/ScopeExit.hh" //#include "FIFORunner.mpp" #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// prefix_ senf::scheduler::detail::FIFORunner::FIFORunner() - : tasks_ (), next_ (tasks_.end()), watchdogMs_ (1000), watchdogCount_(0), hangCount_ (0) + : tasks_ (), next_ (tasks_.end()), watchdogRunning_ (false), watchdogMs_ (1000), + watchdogAbort_ (false), watchdogCount_(0), hangCount_ (0) { struct sigevent ev; ::memset(&ev, 0, sizeof(ev)); @@ -59,6 +62,9 @@ prefix_ senf::scheduler::detail::FIFORunner::FIFORunner() sigaddset(&mask, SIGURG); if (sigprocmask(SIG_UNBLOCK, &mask, 0) < 0) SENF_THROW_SYSTEM_EXCEPTION("sigprocmask()"); + + tasks_.push_back(highPriorityEnd_); + tasks_.push_back(normalPriorityEnd_); } prefix_ senf::scheduler::detail::FIFORunner::~FIFORunner() @@ -67,6 +73,35 @@ prefix_ senf::scheduler::detail::FIFORunner::~FIFORunner() signal(SIGURG, SIG_DFL); } +prefix_ void senf::scheduler::detail::FIFORunner::startWatchdog() +{ + if (watchdogMs_ > 0) { + struct itimerspec timer; + ::memset(&timer, 0, sizeof(timer)); + + timer.it_interval.tv_sec = watchdogMs_ / 1000; + timer.it_interval.tv_nsec = (watchdogMs_ % 1000) * 1000000ul; + timer.it_value.tv_sec = timer.it_interval.tv_sec; + timer.it_value.tv_nsec = timer.it_interval.tv_nsec; + + if (timer_settime(watchdogId_, 0, &timer, 0) < 0) + SENF_THROW_SYSTEM_EXCEPTION("timer_settime()"); + + watchdogRunning_ = true; + } +} + +prefix_ void senf::scheduler::detail::FIFORunner::stopWatchdog() +{ + struct itimerspec timer; + ::memset(&timer, 0, sizeof(timer)); + + if (timer_settime(watchdogId_, 0, &timer, 0) < 0) + SENF_THROW_SYSTEM_EXCEPTION("timer_settime()"); + + watchdogRunning_ = false; +} + // 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(). // @@ -97,76 +132,79 @@ prefix_ void senf::scheduler::detail::FIFORunner::dequeue(TaskInfo * task) tasks_.erase(i); } -namespace { - struct NullTask - : public senf::scheduler::detail::FIFORunner::TaskInfo - { - NullTask() : senf::scheduler::detail::FIFORunner::TaskInfo ("") {} - void run() {}; - }; +prefix_ void senf::scheduler::detail::FIFORunner::run() +{ + TaskList::iterator f (tasks_.begin()); + TaskList::iterator l (TaskList::current(highPriorityEnd_)); + run(f, l); + + f = l; ++f; + l = TaskList::current(normalPriorityEnd_); + run(f, l); + + f = l; ++f; + l = tasks_.end(); + run(f, l); } -prefix_ void senf::scheduler::detail::FIFORunner::run() +prefix_ void senf::scheduler::detail::FIFORunner::run(TaskList::iterator f, TaskList::iterator l) { + if (f == l) + // We'll have problems inserting NullTask between f and l below, so just explicitly bail out + return; + // This algorithm is carefully adjusted to make it work even when arbitrary tasks are removed // from the queue // - Before we begin, we add a NullTask to the queue. The only purpose of this node is, to mark // the current end of the queue. The iterator to this node becomes the end iterator of the // range to process - // - We update the TaskInfo and move it to the end of the queue before calling the callback so + // - We update the TaskInfo and move it to the next queue Element before calling the callback so // we don't access the TaskInfo if it is removed while the callback is running // - We keep the next to-be-processed node in a class variable which is checked and updated // whenever a node is removed. + NullTask null; - struct itimerspec timer; - timer.it_interval.tv_sec = watchdogMs_ / 1000; - timer.it_interval.tv_nsec = (watchdogMs_ % 1000) * 1000000ul; - timer.it_value.tv_sec = timer.it_interval.tv_sec; - timer.it_value.tv_nsec = timer.it_interval.tv_nsec; - tasks_.push_back(null); + tasks_.insert(l, null); TaskList::iterator end (TaskList::current(null)); - next_ = tasks_.begin(); - try { - if (timer_settime(watchdogId_, 0, &timer, 0) < 0) - SENF_THROW_SYSTEM_EXCEPTION("timer_settime()"); - 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(tasks_.end(), tasks_, i); - watchdogCount_ = 1; - task.run(); - } - else - ++ next_; + 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; + task.run(); } + else + ++ next_; } - catch (...) { - watchdogCount_ = 0; - timer.it_interval.tv_sec = 0; - timer.it_interval.tv_nsec = 0; - timer.it_value.tv_sec = 0; - timer.it_value.tv_nsec = 0; - timer_settime(watchdogId_, 0, &timer, 0); - tasks_.erase(end); - next_ = tasks_.end(); - throw; +} + +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 : + return tasks_.end(); + case senf::scheduler::detail::FIFORunner::TaskInfo::PRIORITY_NORMAL : + return TaskList::current(normalPriorityEnd_); + case senf::scheduler::detail::FIFORunner::TaskInfo::PRIORITY_HIGH : + return TaskList::current(highPriorityEnd_); } - watchdogCount_ = 0; - timer.it_interval.tv_sec = 0; - timer.it_interval.tv_nsec = 0; - timer.it_value.tv_sec = 0; - timer.it_value.tv_nsec = 0; - if (timer_settime(watchdogId_, 0, &timer, 0) < 0) - SENF_THROW_SYSTEM_EXCEPTION("timer_settime()"); - tasks_.erase(end); - next_ = tasks_.end(); + return tasks_.begin(); } prefix_ void senf::scheduler::detail::FIFORunner::watchdog(int, siginfo_t * si, void *) @@ -184,6 +222,8 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdog(int, siginfo_t * si, write(1, runner.runningBacktrace_.c_str(), runner.runningBacktrace_.size()); #endif write(1, "\n", 1); + if (runner.watchdogAbort_) + assert(false); } } }