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

diff --git a/senf/Utils/Statistics.cci b/senf/Utils/Statistics.cci
index d58a9bd..6fa454b 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>
@@ -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 &
@@ -92,7 +94,7 @@ prefix_ void senf::StatisticsBase::OutputEntry::consoleList(std::ostream & os)
 // 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()
@@ -168,14 +170,20 @@ senf::Collector::output(unsigned 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>