X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FLocalServer.cpp;h=9e030845db7a1e67f12c96eeddd7c098960b5f9c;hb=c9a91acd707f39fb11d9d513d904cb1f6db52386;hp=63741825afea3ebdddf581ee6fad61b92a4f481d;hpb=bc8edd446b493d53cd351b7ed4c62dce0e305e0c;p=anna.git

diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp
index 6374182..9e03084 100644
--- a/source/diameter.comm/LocalServer.cpp
+++ b/source/diameter.comm/LocalServer.cpp
@@ -43,38 +43,34 @@ LocalServer::LocalServer() :
   a_category(0),
   a_lock(false),
   a_available(false),
-  a_lastUsedResource(NULL),
-  a_statisticsAccumulator(NULL) {}
+  a_lastUsedResource(NULL) {}
 
 
 void LocalServer::initializeStatisticResources() throw() {
   std::string accName = "local server '";
   accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second);
   accName += "' on origin-realm '";
-  accName += a_engine ? a_engine->getOriginRealm() : "unknown"; // it should be known (createServer)
+  accName += a_engine ? a_engine->getOriginRealmName() : "unknown"; // it should be known (createServer)
   accName += "' and origin-host '";
-  accName += a_engine ? a_engine->getOriginHost() : "unknown"; // it should be known (createServer)
+  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 clients connected to", "ms", true/* integer values */);
-  a_received_message_size__StatisticConceptId = a_statisticsAccumulator->addConcept("Diameter message sizes received from clients connected to", "bytes", true/* integer values */);
+  a_messageStatistics.initialize(accName);
 }
 
 void LocalServer::resetStatistics() throw() {
-  a_statisticsAccumulator->reset();
+  a_messageStatistics.getAccumulator()->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));
+void LocalServer::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 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));
+void LocalServer::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));
 }
 
-
 ServerSession* LocalServer::allocateServerSession() throw() { return a_serverSessionsRecycler.create(); }
 void LocalServer::releaseServerSession(ServerSession *serverSession) throw() { a_serverSessionsRecycler.release(serverSession); }
 
@@ -400,7 +396,7 @@ void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millise
 }
 
 void LocalServer::setMaxConnections(int maxConnections) throw(anna::RuntimeException) {
-  LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "setMaxConnections", ANNA_FILE_LOCATION));
+  LOGMETHOD(anna::TraceMethod tttm("anna::diameter::comm::LocalServer", "setMaxConnections", ANNA_FILE_LOCATION));
 
   // Negative & initial
   if(maxConnections < 0) {
@@ -576,7 +572,7 @@ std::string LocalServer::asString() const throw() {
   result += " | Last Outgoing Activity Time: ";
   result += a_lastOutgoingActivityTime.asString();
 //   result += "\n";
-//   result += a_statisticsAccumulator->asString();
+//   result += a_messageStatistics.getAccumulator()->asString();
   // ServerSessions only in xml
   return result += " }";
 }
@@ -600,8 +596,8 @@ anna::xml::Node* LocalServer::asXML(anna::xml::Node* parent) const throw() {
   result->createAttribute("LastIncomingActivityTime", a_lastIncomingActivityTime.asString());
   result->createAttribute("LastOutgoingActivityTime", a_lastOutgoingActivityTime.asString());
   // Statistics
-  anna::xml::Node* stats = result->createChild("Statistics");
-  a_statisticsAccumulator->asXML(stats);
+  anna::xml::Node* stats = result->createChild("MessageStatistics");
+  a_messageStatistics.getAccumulator()->asXML(stats);
   anna::xml::Node* serverSessions = result->createChild("ServerSessions"); // LocalServer.ServerSessions
 
   for(const_serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++)