Register accumulators on stat engine to centralize reports. TODO remove from engine...

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

diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp
index a14b3c6..67c35fc 100644 (file)
--- a/source/diameter.comm/LocalServer.cpp
+++ b/source/diameter.comm/LocalServer.cpp
@@ -44,34 +44,37 @@ LocalServer::LocalServer() :
   a_lock(false),
   a_available(false),
   a_lastUsedResource(NULL) {
-  a_statisticsAccumulator.reset();
+  a_statisticsAccumulator = anna::statistics::Engine::instantiate().createAccumulator();
 }
 
 
 void LocalServer::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_key.first, a_key.second);
-  std::string c1desc = "Diameter processing time (for requests) at clients connected to "; c1desc += serverAsString;
-  std::string c2desc = "Diameter message sizes received from clients connected to "; c2desc += serverAsString;
+  std::string c1desc = "Diameter processing time (for requests) at clients connected to "; c1desc += serverAsString; c1desc += " for realm '"; c1desc += realmName; c1desc += "'";
+  std::string c2desc = "Diameter message sizes received from clients connected to "; 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 LocalServer::resetStatistics() throw() {
-  a_statisticsAccumulator.reset();
+  a_statisticsAccumulator->reset();
 }
 
 void LocalServer::updateProcessingTimeStatisticConcept(const double &value) throw() {
-  a_statisticsAccumulator.process(a_processing_time__StatisticConceptId, value);
-  LOGDEBUG(anna::Logger::debug(a_statisticsAccumulator.asString(), ANNA_FILE_LOCATION));
+  a_statisticsAccumulator->process(a_processing_time__StatisticConceptId, value);
+  LOGDEBUG(anna::Logger::debug(a_statisticsAccumulator->asString(), ANNA_FILE_LOCATION));
 }
 
 void LocalServer::updateReceivedMessageSizeStatisticConcept(const double &value) throw() {
-  a_statisticsAccumulator.process(a_received_message_size__StatisticConceptId, value);
-  //LOGDEBUG(anna::Logger::debug(a_statisticsAccumulator.asString(), ANNA_FILE_LOCATION));
+  a_statisticsAccumulator->process(a_received_message_size__StatisticConceptId, value);
+  //LOGDEBUG(anna::Logger::debug(a_statisticsAccumulator->asString(), ANNA_FILE_LOCATION));
 }
 
 
@@ -565,7 +568,7 @@ std::string LocalServer::asString() const throw() {
   result += " | Last Outgoing Activity Time: ";
   result += a_lastOutgoingActivityTime.asString();
 //   result += "\n";
-//   result += a_statisticsAccumulator.asString();
+//   result += a_statisticsAccumulator->asString();
   // ServerSessions only in xml
   return result += " }";
 }
@@ -590,7 +593,7 @@ anna::xml::Node* LocalServer::asXML(anna::xml::Node* parent) const throw() {
   result->createAttribute("LastOutgoingActivityTime", a_lastOutgoingActivityTime.asString());
   // Statistics
   anna::xml::Node* stats = result->createChild("Statistics");
-  a_statisticsAccumulator.asXML(stats);
+  a_statisticsAccumulator->asXML(stats);
   anna::xml::Node* serverSessions = result->createChild("ServerSessions"); // LocalServer.ServerSessions
 
   for(const_serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++)
@@ -625,4 +628,3 @@ void LocalServer::updateOutgoingActivityTime(void) throw() {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 }
-