Message statistics

[anna.git] / include / anna / diameter.comm / LocalServer.hpp

diff --git a/include/anna/diameter.comm/LocalServer.hpp b/include/anna/diameter.comm/LocalServer.hpp
index 2416e8c..e0ce97c 100644 (file)
--- a/include/anna/diameter.comm/LocalServer.hpp
+++ b/include/anna/diameter.comm/LocalServer.hpp
@@ -17,10 +17,13 @@
 // STL
 #include <string>
 #include <vector>
+#include <map>
 
+// Project
 #include <anna/config/defines.hpp>
-#include <anna/statistics/Accumulator.hpp>
 #include <anna/diameter.comm/ServerSession.hpp>
+#include <anna/diameter/defines.hpp>
+#include <anna/diameter.comm/MessageStatistics.hpp>
 
 
 namespace anna {
@@ -65,9 +68,7 @@ class LocalServer {
   Engine *a_engine;
 
   // Statistics
-  int a_processing_time__StatisticConceptId; // request from local server (dpr's, etc.)
-  int a_received_message_size__StatisticConceptId;
-  anna::statistics::Accumulator *a_statisticsAccumulator;
+  MessageStatistics a_messageStatistics;
   void initializeStatisticResources() throw();
   void resetStatistics() throw();
 
@@ -351,10 +352,10 @@ public:
   anna::xml::Node* asXML(anna::xml::Node* parent) const throw();
 
   // Statistics
-  void updateProcessingTimeStatisticConcept(const double &value) throw();
-  void updateReceivedMessageSizeStatisticConcept(const double &value) throw();
-  int getProcessingTimeStatisticConcept() const throw() { return a_processing_time__StatisticConceptId; }
-  int getReceivedMessageSizeStatisticConcept() const throw() { return a_received_message_size__StatisticConceptId; }
+  void updateProcessingTimeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw();
+  void updateReceivedMessageSizeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw();
+//  int getProcessingTimeStatisticConcept() const throw() { return a_processing_time__StatisticConceptId; }
+//  int getReceivedMessageSizeStatisticConcept() const throw() { return a_received_message_size__StatisticConceptId; }
 
 protected: