added scheduler watchdog members to sys/scheduler console dir

[senf.git] / senf / Scheduler / EventManager.cc

diff --git a/senf/Scheduler/EventManager.cc b/senf/Scheduler/EventManager.cc
index 4dd2064..3c20571 100644 (file)
--- a/senf/Scheduler/EventManager.cc
+++ b/senf/Scheduler/EventManager.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -29,18 +29,20 @@
 // Custom includes
 #include <boost/format.hpp>
 #include <senf/Utils/membind.hh>
-#include <senf/Utils/Console/Console.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include "ConsoleDir.hh"
 #include "FIFORunner.hh"
 
 //#include "EventManager.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::scheduler::detail::EventManager::EventManager()
 {
 #ifndef SENF_DISABLE_CONSOLE
-    consoleDir_().add("events", senf::console::factory::Command(
-                          senf::membind(&EventManager::listEvents, this))
+    consoleDir().add("events", console::factory::Command(
+            membind(&EventManager::listEvents, this))
         .doc("List all scheduler events sorted by priority\n"
              "\n"
              "Columns:\n"
@@ -58,8 +60,6 @@ prefix_ senf::scheduler::detail::EventManager::EventManager()
              "              -  event disabled\n"
              "    INFO    further event specific information")
         );
-
-    senf::console::sysdir().add("scheduler", consoleDir_());
 #endif
 }
 
@@ -73,9 +73,9 @@ prefix_ void senf::scheduler::detail::EventManager::listEvents(std::ostream & os
         FIFORunner::iterator i (FIFORunner::instance().begin());
         FIFORunner::iterator const i_end (FIFORunner::instance().end());
         for (; i != i_end; ++i)
-            os << fmt 
+            os << fmt
                 % i->type()
-                % i->name() 
+                % i->name()
                 % reinterpret_cast<unsigned long>(&(*i))
                 % i->runCount()
                 % (i->runnable() ? "R" : "W")
@@ -88,7 +88,7 @@ prefix_ void senf::scheduler::detail::EventManager::listEvents(std::ostream & os
             if (! i->enabled())
                 os << fmt
                     % i->type()
-                    % i->name() 
+                    % i->name()
                     % reinterpret_cast<unsigned long>(&(*i))
                     % i->runCount()
                     % "-"
@@ -96,7 +96,7 @@ prefix_ void senf::scheduler::detail::EventManager::listEvents(std::ostream & os
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "EventManager.mpp"