X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatisticsTargets.cc;h=2c6f297822fa9176613eb77164c9157dba48f655;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=a131e36c3fdb4c679194a3cb48278edd45db2bc0;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/StatisticsTargets.cc b/senf/Utils/StatisticsTargets.cc index a131e36..2c6f297 100644 --- a/senf/Utils/StatisticsTargets.cc +++ b/senf/Utils/StatisticsTargets.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -28,14 +28,14 @@ // Custom includes #include -#include "Console/Console.hh" +#include #include "Statistics.hh" //#include "StatisticsTargets.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::detail::StatisticsLoggerRegistry prefix_ void @@ -49,7 +49,7 @@ senf::detail::StatisticsLoggerRegistry::apply(senf::StatisticsBase & stats, (*i)(stats, rank, dir); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -57,11 +57,11 @@ namespace { { RegisterStatisticsLogger(); - static void adder(senf::StatisticsBase & stats, + static void adder(senf::StatisticsBase & stats, unsigned rank, senf::console::DirectoryNode & dir); - static void consoleCreate(senf::StatisticsBase & stats, + static void consoleCreate(senf::StatisticsBase & stats, unsigned rank, std::string const & prefix); }; @@ -79,12 +79,13 @@ prefix_ void RegisterStatisticsLogger::adder(senf::StatisticsBase & stats, senf::console::DirectoryNode & dir) { namespace kw = senf::console::kw; - - dir.add("logger", boost::function( - boost::bind(&consoleCreate, boost::ref(stats), rank, _1))) - .arg("prefix","Optional prefix string to add to each log message", - kw::default_value = "") - .doc("Send log messages to statistics log stream"); + namespace fty = senf::console::factory; + + dir.add("logger", fty::Command( + boost::bind(&consoleCreate, boost::ref(stats), rank, _1)) + .arg("prefix","Optional prefix string to add to each log message", + kw::default_value = "") + .doc("Send log messages to statistics log stream") ); } prefix_ void RegisterStatisticsLogger::consoleCreate(senf::StatisticsBase & stats, @@ -95,7 +96,7 @@ prefix_ void RegisterStatisticsLogger::consoleCreate(senf::StatisticsBase & stat "senf::StatisticsLogger(\"" + prefix + "\")"); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "StatisticsTargets.mpp"