X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FFIFORunner.cci;h=0ddc8899908be3a1eaaf70c6b68d9ae6f6270006;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=fb080591efbf8bedb207a18e104cd19bc24c336c;hpb=2da517bbcdb2af10d2322fc762ca27774b53b435;p=senf.git

diff --git a/Scheduler/FIFORunner.cci b/Scheduler/FIFORunner.cci
index fb08059..0ddc889 100644
--- a/Scheduler/FIFORunner.cci
+++ b/Scheduler/FIFORunner.cci
@@ -34,8 +34,12 @@
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_ senf::scheduler::detail::FIFORunner::TaskInfo::TaskInfo(std::string const & name)
-    : Event(name), runnable_ (false)
+///////////////////////////////////////////////////////////////////////////
+//  senf::scheduler::detail::FIFORunner::TaskInfo
+
+prefix_ senf::scheduler::detail::FIFORunner::TaskInfo::TaskInfo(std::string const & name,
+                                                                Priority priority)
+    : Event(name), runnable_ (false), priority_ (priority)
 {}
 
 prefix_ senf::scheduler::detail::FIFORunner::TaskInfo::~TaskInfo()
@@ -48,8 +52,15 @@ prefix_ void senf::scheduler::detail::FIFORunner::TaskInfo::setRunnable()
 
 prefix_ void senf::scheduler::detail::FIFORunner::TaskInfo::run()
 {
-    v_run();
     countRun();
+    // Be sure to run v_run last since the callback may destroy this instance
+    v_run();
+}
+
+prefix_ bool senf::scheduler::detail::FIFORunner::TaskInfo::runnable()
+    const
+{
+    return runnable_;
 }
 
 prefix_ bool senf::scheduler::detail::FIFORunner::TaskInfo::v_enabled()
@@ -58,9 +69,40 @@ prefix_ bool senf::scheduler::detail::FIFORunner::TaskInfo::v_enabled()
     return TaskListBase::linked();
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::detail::FIFORunner::NullTask
+
+prefix_ senf::scheduler::detail::FIFORunner::NullTask::NullTask()
+    : senf::scheduler::detail::FIFORunner::TaskInfo ("<null>") 
+{}
+
+prefix_ senf::scheduler::detail::FIFORunner::NullTask::~NullTask()
+{
+    if (TaskListBase::linked())
+        FIFORunner::instance().dequeue(this);
+}
+
+prefix_ void senf::scheduler::detail::FIFORunner::NullTask::v_run()
+{}
+
+prefix_ char const * senf::scheduler::detail::FIFORunner::NullTask::v_type()
+    const
+{
+    return 0;
+}
+
+prefix_ std::string senf::scheduler::detail::FIFORunner::NullTask::v_info()
+    const
+{
+    return "";
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::detail::FIFORunner
+
 prefix_ void senf::scheduler::detail::FIFORunner::enqueue(TaskInfo * task)
 {
-    tasks_.push_back(*task);
+    tasks_.insert(priorityEnd(task->priority_), *task);
 #ifdef SENF_DEBUG
     std::stringstream ss;
     backtrace(ss, 32);
@@ -71,6 +113,8 @@ prefix_ void senf::scheduler::detail::FIFORunner::enqueue(TaskInfo * task)
 prefix_ void senf::scheduler::detail::FIFORunner::taskTimeout(unsigned ms)
 {
     watchdogMs_ = ms;
+    if (watchdogRunning_)
+        startWatchdog();
 }
 
 prefix_ unsigned senf::scheduler::detail::FIFORunner::taskTimeout()
@@ -79,10 +123,44 @@ prefix_ unsigned senf::scheduler::detail::FIFORunner::taskTimeout()
     return watchdogMs_;
 }
 
+prefix_ void senf::scheduler::detail::FIFORunner::abortOnTimeout(bool flag)
+{
+    watchdogAbort_ = flag;
+}
+
+prefix_ bool senf::scheduler::detail::FIFORunner::abortOnTimeout()
+    const
+{
+    return watchdogAbort_;
+}
+
 prefix_ unsigned senf::scheduler::detail::FIFORunner::hangCount()
+{
+    unsigned hc (hangCount_);
+    hangCount_ = 0;
+    return hc;
+}
+
+prefix_ senf::scheduler::detail::FIFORunner::iterator
+senf::scheduler::detail::FIFORunner::begin()
+    const
+{
+    // We need to filter out elements with e.type() == 0 ... the NullTask temporarily added is such
+    // an element and must be skipped.
+    return boost::make_filter_iterator(
+        EventManager::IteratorFilter(), tasks_.begin(), tasks_.end());
+}
+
+prefix_ senf::scheduler::detail::FIFORunner::iterator senf::scheduler::detail::FIFORunner::end()
     const
 {
-    return hangCount_;
+    return boost::make_filter_iterator(
+        EventManager::IteratorFilter(), tasks_.end(), tasks_.end());
+}
+
+prefix_ void senf::scheduler::detail::FIFORunner::yield()
+{
+    yield_ = true;
 }
 
 ///////////////////////////////cci.e///////////////////////////////////////