X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FEventManager.cc;h=3f755af01da04ee7c8bb6ab6de5008607895fffa;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=d267a1ee818515d206ed5b42d31fdee64e64f3de;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/EventManager.cc b/senf/Scheduler/EventManager.cc
index d267a1e..3f755af 100644
--- 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>
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <boost/format.hpp>
-#include "../Utils/membind.hh"
-#include "../Utils/Console/Console.hh"
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/Console/Console.hh>
 #include "FIFORunner.hh"
 
 //#include "EventManager.mpp"
@@ -39,7 +39,8 @@
 prefix_ senf::scheduler::detail::EventManager::EventManager()
 {
 #ifndef SENF_DISABLE_CONSOLE
-    consoleDir_().add("events", senf::membind(&EventManager::listEvents, this))
+    consoleDir_().add("events", senf::console::factory::Command(
+                          senf::membind(&EventManager::listEvents, this))
         .doc("List all scheduler events sorted by priority\n"
              "\n"
              "Columns:\n"
@@ -55,7 +56,8 @@ prefix_ senf::scheduler::detail::EventManager::EventManager()
              "              R  runnable\n"
              "              W  waiting\n"
              "              -  event disabled\n"
-             "    INFO    further event specific information");
+             "    INFO    further event specific information")
+        );
 
     senf::console::sysdir().add("scheduler", consoleDir_());
 #endif
@@ -71,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")
@@ -86,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()
                     % "-"