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

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

diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp
index a751d48..758ac2d 100644 (file)
--- a/source/diameter.comm/Server.cpp
+++ b/source/diameter.comm/Server.cpp
@@ -36,34 +36,37 @@ void Server::initialize() throw() {
   a_maxClientSessions = 1; // mono client connection
   a_lastIncomingActivityTime = (anna::Millisecond)0;
   a_lastOutgoingActivityTime = (anna::Millisecond)0;
-  a_statisticsAccumulator.reset();
+  a_statisticsAccumulator = anna::statistics::Engine::instantiate().createAccumulator();
   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;
-  std::string c2desc = "Diameter message sizes received from servers on "; c2desc += serverAsString;
+  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::resetStatistics() throw() {
-  a_statisticsAccumulator.reset();
+  a_statisticsAccumulator->reset();
 }
 
 void Server::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 Server::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));
 }
 
 
@@ -280,7 +283,7 @@ std::string Server::asString() const throw() {
   result += " | Hidden: ";
   result += (hidden() ? "yes" : "no");
   result += "\n";
-  result += a_statisticsAccumulator.asString();
+  result += a_statisticsAccumulator->asString();
 
   for(std::vector<ClientSession*>::const_iterator it = begin(); it != end(); it++) {
     result += "\n";
@@ -304,7 +307,7 @@ anna::xml::Node* Server::asXML(anna::xml::Node* parent) const throw() {
   result->createAttribute("Hidden", hidden() ? "yes" : "no");
   // Statistics
   anna::xml::Node* stats = result->createChild("Statistics");
-  a_statisticsAccumulator.asXML(stats);
+  a_statisticsAccumulator->asXML(stats);
   anna::xml::Node* clientSessions = result->createChild("Server.ClientSessions");
 
   for(std::vector<ClientSession*>::const_iterator it = begin(); it != end(); it++)
@@ -438,4 +441,3 @@ void Server::updateOutgoingActivityTime(void) throw() {
   );
   a_parent->updateOutgoingActivityTime();
 }
-