PPI: Missing commit

[senf.git] / Scheduler / EventManager.cc

diff --git a/Scheduler/EventManager.cc b/Scheduler/EventManager.cc
index aaf1622..d267a1e 100644 (file)
--- a/Scheduler/EventManager.cc
+++ b/Scheduler/EventManager.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include <boost/format.hpp>
 #include "../Utils/membind.hh"
-#include "Console/Console.hh"
+#include "../Utils/Console/Console.hh"
 #include "FIFORunner.hh"
 
 //#include "EventManager.mpp"
@@ -39,22 +39,29 @@
 prefix_ senf::scheduler::detail::EventManager::EventManager()
 {
 #ifndef SENF_DISABLE_CONSOLE
-    consoleDir_().add("events", senf::membind(&EventManager::consoleEvents, this))
+    consoleDir_().add("events", senf::membind(&EventManager::listEvents, this))
         .doc("List all scheduler events sorted by priority\n"
              "\n"
              "Columns:\n"
-             "    TP      event type: fd - file descriptor, tm - timer, si - UNIX signal\n"
+             "    TP      event type:\n"
+             "              fd  file descriptor\n"
+             "              tm  timer\n"
+             "              si  UNIX signal\n"
+             "              ee  event hook\n"
              "    NAME    descriptive event name\n"
              "    ADDRESS address of event class instance\n"
              "    RUNCNT  number of times, the event was called\n"
-             "    S       state: R - runnable, W - Waiting, '-' - event disabled\n"
+             "    S       state:\n"
+             "              R  runnable\n"
+             "              W  waiting\n"
+             "              -  event disabled\n"
              "    INFO    further event specific information");
 
     senf::console::sysdir().add("scheduler", consoleDir_());
 #endif
 }
 
-prefix_ void senf::scheduler::detail::EventManager::consoleEvents(std::ostream & os)
+prefix_ void senf::scheduler::detail::EventManager::listEvents(std::ostream & os)
 {
     // On an 80 column display, this wraps nicely directly before the INFO column
     boost::format fmt  ("%s %-55.55s 0x%08x %8d %s %s\n");