// Custom includes
#include <signal.h>
#include <time.h>
-#include <boost/lambda/lambda.hpp>
-#include <senf/Utils/Exception.hh>
-#include <senf/Utils/senfassert.hh>
-#include <senf/Utils/ScopeExit.hh>
+#include <cassert>
#ifdef SENF_DEBUG
#include <execinfo.h>
#endif
#include <senf/config.hh>
#include <stdint.h>
#include <stdio.h>
+#include <senf/Utils/Exception.hh>
+#include <senf/Utils/senfassert.hh>
#include "senf/Utils/IgnoreValue.hh"
+#include <senf/Utils/Console/ScopedDirectory.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include "ConsoleDir.hh"
//#include "FIFORunner.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
prefix_ senf::scheduler::detail::FIFORunner::FIFORunner()
: tasks_ (), next_ (tasks_.end()), watchdogRunning_ (false), watchdogMs_ (1000),
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()
// 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
prefix_ void senf::scheduler::detail::FIFORunner::run()
{
- for(;;) {
+ for (;;) {
TaskList::iterator f (tasks_.begin());
TaskList::iterator l (TaskList::current(highPriorityEnd_));
run(f, l);
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;
}
}
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();
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];
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) );
assert(false);
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "FIFORunner.mpp"
projects / senf.git / blobdiff