X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FFIFORunner.cc;h=03a57778cba04aea7fd6d4854864e8cde01c1ca4;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=783a98d9b95957a5d3d1148223997892479a868e;hpb=79a8a7f0632a27331df5814bec6c8c53470eb8ce;p=senf.git diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc index 783a98d..03a5777 100644 --- a/senf/Scheduler/FIFORunner.cc +++ b/senf/Scheduler/FIFORunner.cc @@ -29,19 +29,22 @@ // Custom includes #include #include -#include -#include -#ifdef SENF_DEBUG +#include +#include +#ifdef SENF_BACKTRACE #include #endif -#include #include #include +#include #include "senf/Utils/IgnoreValue.hh" +#include +#include +#include "ConsoleDir.hh" //#include "FIFORunner.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// prefix_ senf::scheduler::detail::FIFORunner::FIFORunner() : tasks_ (), next_ (tasks_.end()), watchdogRunning_ (false), watchdogMs_ (1000), @@ -70,12 +73,38 @@ prefix_ senf::scheduler::detail::FIFORunner::FIFORunner() tasks_.push_back(highPriorityEnd_); tasks_.push_back(normalPriorityEnd_); + +#ifndef SENF_DISABLE_CONSOLE + namespace fty = console::factory; + consoleDir().add("abortOnWatchdocTimeout", fty::Command( + SENF_MEMBINDFNP( bool, FIFORunner, abortOnTimeout, () const )) + .doc("Get current watchdog abort on event status.") ); + consoleDir().add("abortOnWatchdocTimeout", fty::Command( + SENF_MEMBINDFNP( void, FIFORunner, abortOnTimeout, (bool) )) + .doc("Enable/disable abort on watchdog event.") ); + consoleDir().add("watchdogTimeout", fty::Command( + SENF_MEMBINDFNP( unsigned, FIFORunner, taskTimeout, () const )) + .doc("Get current watchdog timeout in milliseconds") ); + consoleDir().add("watchdogTimeout", fty::Command( + SENF_MEMBINDFNP( void, FIFORunner, taskTimeout, (unsigned) )) + .doc("Set watchdog timeout to in milliseconds\n" + "Setting the watchdog timeout to 0 will disable the watchdog.") ); + consoleDir().add("watchdogEvents", fty::Command(membind( &FIFORunner::hangCount, this)) + .doc("Get number of occurred watchdog events.\n" + "Calling this method will reset the counter to 0") ); +#endif } prefix_ senf::scheduler::detail::FIFORunner::~FIFORunner() { timer_delete(watchdogId_); signal(SIGURG, SIG_DFL); + +#ifndef SENF_DISABLE_CONSOLE + consoleDir().remove("abortOnWatchdocTimeout"); + consoleDir().remove("watchdogTimeout"); + consoleDir().remove("watchdogEvents"); +#endif } prefix_ void senf::scheduler::detail::FIFORunner::startWatchdog() @@ -112,7 +141,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 @@ -141,7 +170,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::dequeue(TaskInfo * task) prefix_ void senf::scheduler::detail::FIFORunner::run() { - for(;;) { + for (;;) { TaskList::iterator f (tasks_.begin()); TaskList::iterator l (TaskList::current(highPriorityEnd_)); run(f, l); @@ -199,9 +228,9 @@ prefix_ void senf::scheduler::detail::FIFORunner::run(TaskList::iterator f, Task if (task.runnable_) { task.runnable_ = false; runningName_ = task.name(); - # ifdef SENF_DEBUG +# ifdef SENF_BACKTRACE runningBacktrace_ = task.backtrace_; - # endif +# endif TaskList::iterator i (next_); ++ next_; tasks_.splice(l, tasks_, i); @@ -215,11 +244,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 +281,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]; @@ -264,10 +289,13 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError() senf::IGNORE( write(1, pid, 6) ); senf::IGNORE( write(1, "): ", 3) ); senf::IGNORE( write(1, runningName_.c_str(), runningName_.size()) ); - senf::IGNORE( write(1, " at\n ", 3) ); -#ifdef SENF_DEBUG - unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) ); - for (unsigned i (0); i < nEntries; ++i) { +/* senf::IGNORE( write(1, " at\n ", 3) ); +#ifdef SENF_BACKTRACE + 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]; + int nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) ); + for (int i=0; i < nEntries; ++i) { senf::IGNORE( write(1, " 0x", 3) ); for (unsigned j (sizeof(void*)); j > 0; --j) { uintptr_t v ( reinterpret_cast(entries[i]) >> (8*(j-1)) ); @@ -275,10 +303,10 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError() senf::IGNORE( write(1, &(hex[ (v ) & 0x0f ]), 1) ); } } -#endif +#endif*/ senf::IGNORE( write(1, "\n", 1) ); -#ifdef SENF_DEBUG +#ifdef SENF_BACKTRACE senf::IGNORE( write(1, "Task was initialized at\n", 24) ); senf::IGNORE( write(1, runningBacktrace_.c_str(), runningBacktrace_.size()) ); #endif @@ -287,7 +315,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError() assert(false); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "FIFORunner.mpp"