diff --git a/Scheduler/Console/Executor.cc b/Scheduler/Console/Executor.cc index 80d632fb504a0c548045b9fff08003ba72e28c3b..5a6337dd3394f5dbb6ae39fce38ba5a09e89d5cc 100644 --- a/Scheduler/Console/Executor.cc +++ b/Scheduler/Console/Executor.cc @@ -232,7 +232,7 @@ prefix_ void senf::console::Executor::help(std::ostream & output, ParseCommandInfo::TokensRange path) { GenericNode const & node (traverseNode(path)); - output << prettyName(typeid(node)) << " at " << node.path() << "\n\n"; + // output << prettyName(typeid(node)) << " at " << node.path() << "\n\n"; node.help(output); output << std::flush; } diff --git a/Scheduler/Console/Executor.test.cc b/Scheduler/Console/Executor.test.cc index a2b98abe5217d49ace2cd53599e6f87293f50c1b..2c33677817016f4de70bfd79abe9182aaba91194 100644 --- a/Scheduler/Console/Executor.test.cc +++ b/Scheduler/Console/Executor.test.cc @@ -148,7 +148,7 @@ BOOST_AUTO_UNIT_TEST(executor) parser.parse("help /dir2", &setCommand); executor(os, commands.back()); BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinHELP ); - BOOST_CHECK_EQUAL( os.str(), "senf::console::DirectoryNode at /dir2\n\nHelptext\n" ); + BOOST_CHECK_EQUAL( os.str(), "Helptext\n" ); } { diff --git a/Scheduler/EventManager.cc b/Scheduler/EventManager.cc index fdea03abaef2f140177328b4bd53f8280b250346..aaf1622a1cb4d51e8ff18b2694e3a60f16b28e1d 100644 --- a/Scheduler/EventManager.cc +++ b/Scheduler/EventManager.cc @@ -39,7 +39,17 @@ prefix_ senf::scheduler::detail::EventManager::EventManager() { #ifndef SENF_DISABLE_CONSOLE - consoleDir_().add("events", senf::membind(&EventManager::consoleEvents, this)); + consoleDir_().add("events", senf::membind(&EventManager::consoleEvents, 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" + " 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" + " INFO further event specific information"); + senf::console::sysdir().add("scheduler", consoleDir_()); #endif }