Include accumulators on statistics engine in order to centralize and ease asXML....

[anna.git] / source / diameter.comm / Server.cpp

diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp
index 758ac2d..0b9bcd7 100644 (file)
--- a/source/diameter.comm/Server.cpp
+++ b/source/diameter.comm/Server.cpp
@@ -36,23 +36,19 @@ void Server::initialize() throw() {
   a_maxClientSessions = 1; // mono client connection
   a_lastIncomingActivityTime = (anna::Millisecond)0;
   a_lastOutgoingActivityTime = (anna::Millisecond)0;
-  a_statisticsAccumulator = anna::statistics::Engine::instantiate().createAccumulator();
+  a_statisticsAccumulator = NULL;
   a_lastUsedResource = NULL;
 }
 
-void Server::initializeStatisticConcepts() throw() {
-  // Realm name
-  std::string realmName = a_engine ? a_engine->getRealm() : "unknown"; // it should be known (createServer)
-
-  // Statistics:
-  anna::statistics::Engine& statsEngine = anna::statistics::Engine::instantiate();
-  // Concepts descriptions:
-  std::string serverAsString = anna::functions::socketLiteralAsString(a_socket.first, a_socket.second);
-  std::string c1desc = "Diameter processing time (for requests) at servers on "; c1desc += serverAsString; c1desc += " for realm '"; c1desc += realmName; c1desc += "'";
-  std::string c2desc = "Diameter message sizes received from servers on "; c2desc += serverAsString; c2desc += " for realm '"; c2desc += realmName; c2desc += "'";
-  // Registering
-  a_processing_time__StatisticConceptId = statsEngine.addConcept(c1desc.c_str(), "ms", true/* integer values */);
-  a_received_message_size__StatisticConceptId = statsEngine.addConcept(c2desc.c_str(), "bytes", true/* integer values */);
+void Server::initializeStatisticResources() throw() {
+  std::string accName = "remote server '";
+  accName += anna::functions::socketLiteralAsString(a_socket.first, a_socket.second);
+  accName += "' from realm '";
+  accName += a_engine ? a_engine->getRealm() : "unknown"; // it should be known (createServer)
+  accName += "'";
+  a_statisticsAccumulator = anna::statistics::Engine::instantiate().createAccumulator(accName);
+  a_processing_time__StatisticConceptId = a_statisticsAccumulator->addConcept("Diameter requests processing time at", "ms", true/* integer values */);
+  a_received_message_size__StatisticConceptId = a_statisticsAccumulator->addConcept("Diameter message sizes received from", "bytes", true/* integer values */);
 }
 
 void Server::resetStatistics() throw() {