X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatisticsTargets.cc;h=b14d8cd4cfe2d068d74396ef8297ed4caf67ca79;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=f771789c77aeac005ae9a298c8019a4e57cf30a0;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Utils/StatisticsTargets.cc b/senf/Utils/StatisticsTargets.cc index f771789..b14d8cd 100644 --- a/senf/Utils/StatisticsTargets.cc +++ b/senf/Utils/StatisticsTargets.cc @@ -1,24 +1,29 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief StatisticsTargets non-inline non-template implementation */ @@ -28,20 +33,19 @@ // Custom includes #include -#include +#include #include "Statistics.hh" //#include "StatisticsTargets.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::detail::StatisticsLoggerRegistry prefix_ void -senf::detail::StatisticsLoggerRegistry::apply(senf::StatisticsBase & stats, - unsigned rank, - senf::console::DirectoryNode & dir) +senf::detail::StatisticsLoggerRegistry::apply(StatisticsBase & stats, + unsigned rank, console::DirectoryNode & dir) { Adders::const_iterator i (adders_.begin()); Adders::const_iterator const i_end (adders_.end()); @@ -49,7 +53,7 @@ senf::detail::StatisticsLoggerRegistry::apply(senf::StatisticsBase & stats, (*i)(stats, rank, dir); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -57,13 +61,11 @@ namespace { { RegisterStatisticsLogger(); - static void adder(senf::StatisticsBase & stats, - unsigned rank, - senf::console::DirectoryNode & dir); + static void adder(senf::StatisticsBase & stats, + unsigned rank, senf::console::DirectoryNode & dir); - static void consoleCreate(senf::StatisticsBase & stats, - unsigned rank, - std::string const & prefix); + static void consoleCreate(senf::StatisticsBase & stats, + unsigned rank, std::string const & prefix); }; RegisterStatisticsLogger registerStatisticsLogger; @@ -75,27 +77,25 @@ prefix_ RegisterStatisticsLogger::RegisterStatisticsLogger() } prefix_ void RegisterStatisticsLogger::adder(senf::StatisticsBase & stats, - unsigned rank, - senf::console::DirectoryNode & dir) + unsigned rank, 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, - unsigned rank, - std::string const & prefix) + unsigned rank, std::string const & prefix) { stats.output(rank).connect(senf::StatisticsLogger(prefix), "senf::StatisticsLogger(\"" + prefix + "\")"); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "StatisticsTargets.mpp"