X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatistics.cci;h=2e7299166d888536cbdc0ef9f5bd7b6973c313b1;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=d58a9bdf3569ea8265cd9590db1cc99bcc3b258b;hpb=69be773e2fe0ea5d60cb4a763bfffa673cfc417f;p=senf.git

diff --git a/senf/Utils/Statistics.cci b/senf/Utils/Statistics.cci
index d58a9bd..2e72991 100644
--- a/senf/Utils/Statistics.cci
+++ b/senf/Utils/Statistics.cci
@@ -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>
@@ -30,9 +30,9 @@
 #include "Range.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase::Transform
 
 prefix_ senf::StatisticsBase::Transform::result_type
@@ -42,7 +42,7 @@ senf::StatisticsBase::Transform::operator()(first_argument_type i)
     return i.second;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase::OutputEntry
 
 prefix_ senf::StatisticsBase::OutputEntry::OutputEntry()
@@ -65,8 +65,10 @@ prefix_ senf::StatisticsBase::OutputEntry::OutputEntry(const OutputEntry& other)
 
 prefix_ void senf::StatisticsBase::OutputEntry::initDir()
 {
-    dir.add("list", senf::membind(&OutputEntry::consoleList, this))
-        .doc("List all known connected targets. This list might not be complete.");
+    namespace fty = senf::console::factory;
+
+    dir.add("list", fty::Command(&OutputEntry::consoleList, this)
+            .doc("List all known connected targets. This list might not be complete.") );
 }
 
 prefix_ senf::StatisticsBase::OutputEntry &
@@ -88,11 +90,11 @@ prefix_ void senf::StatisticsBase::OutputEntry::consoleList(std::ostream & os)
             os << i->label << "\n";
 }
 
-/////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase
 
 prefix_ senf::StatisticsBase::StatisticsBase()
-    : min_ (0.0f), avg_ (0.0f), max_ (0.0f), maxQueueLen_ (0u)
+    : min_ (0.0f), avg_ (0.0f), max_ (0.0f), dev_ (0.0f), maxQueueLen_ (0u)
 {}
 
 prefix_ senf::StatisticsBase::~StatisticsBase()
@@ -144,7 +146,7 @@ prefix_ std::string senf::StatisticsBase::path()
     return v_path();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Collector
 
 prefix_ senf::Collector::Collector(StatisticsBase * owner, unsigned rank)
@@ -165,17 +167,23 @@ senf::Collector::output(unsigned n)
     return StatisticsBase::OutputProxy<Collector>(this, StatisticsBase::output(n));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Statistics
 
+prefix_ void senf::Statistics::operator()(unsigned n, float min, float avg, float max,
+                                          float dev)
+{
+    enter(n, min, avg, max, dev);
+}
+
 prefix_ void senf::Statistics::operator()(float min, float avg, float max, float dev)
 {
-    enter(min, avg, max, dev);
+    enter(1, min, avg, max, dev);
 }
 
 prefix_ void senf::Statistics::operator()(float value, float dev)
 {
-    enter(value, value, value, dev);
+    enter(1, value, value, value, dev);
 }
 
 prefix_ senf::StatisticsBase::OutputProxy<senf::Statistics>
@@ -184,7 +192,7 @@ senf::Statistics::output(unsigned n)
     return StatisticsBase::OutputProxy<Statistics>(this, StatisticsBase::output(n));
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_