Testing library separation: now not in launcher but isolated

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

diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp
index 0b9bcd7..3207094 100644 (file)
--- a/source/diameter.comm/Server.cpp
+++ b/source/diameter.comm/Server.cpp
@@ -36,33 +36,32 @@ void Server::initialize() throw() {
   a_maxClientSessions = 1; // mono client connection
   a_lastIncomingActivityTime = (anna::Millisecond)0;
   a_lastOutgoingActivityTime = (anna::Millisecond)0;
-  a_statisticsAccumulator = NULL;
   a_lastUsedResource = NULL;
 }
 
 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 += "' from origin-realm '";
+  accName += a_engine ? a_engine->getOriginRealmName() : "unknown"; // it should be known (createServer)
+  accName += "' and origin-host '";
+  accName += a_engine ? a_engine->getOriginHostName() : "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 */);
+  a_messageStatistics.initialize(accName);
 }
 
 void Server::resetStatistics() throw() {
-  a_statisticsAccumulator->reset();
+  a_messageStatistics.getAccumulator()->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));
+void Server::updateProcessingTimeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw() {
+  a_messageStatistics.process(MessageStatistics::ConceptType::SentRequestProcessingTime, cid, value);
+  LOGDEBUG(anna::Logger::debug(a_messageStatistics.getAccumulator()->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));
+void Server::updateReceivedMessageSizeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw() {
+  a_messageStatistics.process(MessageStatistics::ConceptType::ReceivedMessageSize, cid, value);
+  LOGDEBUG(anna::Logger::debug(a_messageStatistics.getAccumulator()->asString(), ANNA_FILE_LOCATION));
 }
 
 
@@ -279,7 +278,7 @@ std::string Server::asString() const throw() {
   result += " | Hidden: ";
   result += (hidden() ? "yes" : "no");
   result += "\n";
-  result += a_statisticsAccumulator->asString();
+  result += a_messageStatistics.getAccumulator()->asString();
 
   for(std::vector<ClientSession*>::const_iterator it = begin(); it != end(); it++) {
     result += "\n";
@@ -303,7 +302,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_messageStatistics.getAccumulator()->asXML(stats);
   anna::xml::Node* clientSessions = result->createChild("Server.ClientSessions");
 
   for(std::vector<ClientSession*>::const_iterator it = begin(); it != end(); it++)