X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FLocalServer.cpp;h=b43a75420ce40186a2daea0eb6218c3027c22714;hb=983eaadca6cfae987be3453853d75bb9bce04487;hp=985e4a8fc7a89749b0c51b998414f4afab75ad7f;hpb=129af2a9a7c287843be5bd443c5b1ad9b08438a8;p=anna.git

diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp
index 985e4a8..b43a754 100644
--- a/source/diameter.comm/LocalServer.cpp
+++ b/source/diameter.comm/LocalServer.cpp
@@ -43,35 +43,33 @@ LocalServer::LocalServer() :
   a_category(0),
   a_lock(false),
   a_available(false),
-  a_lastUsedResource(NULL) {
-  a_statisticsAccumulator.reset();
-}
-
-
-void LocalServer::initializeStatisticConcepts() throw() {
-  // 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;
-  // 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 */);
+  a_lastUsedResource(NULL),
+  a_statisticsAccumulator(NULL) {}
+
+
+void LocalServer::initializeStatisticResources() throw() {
+  std::string accName = "local server '";
+  accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second);
+  accName += "' on 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 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 */);
 }
 
 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));
 }
 
 
@@ -305,6 +303,10 @@ throw(anna::RuntimeException) {
   if(ii == serverSession_end())
     return;
 
+  // Remove origin-realm / origin-host for server session in delivery map
+  // This is related to http://redmine.teslayout.com/issues/41
+  a_engine->manageDrDhServerSession(serverSession, false /* desregister */);
+
   try {
     //serverSession->setState(ServerSession::State::Closing); NOT MANAGED WITH SERVER SESSIONS
     serverSession->unbind(true /* always forceDisconnect on server sessions ... */);
@@ -561,7 +563,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 += " }";
 }
@@ -586,7 +588,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++)
@@ -621,4 +623,3 @@ void LocalServer::updateOutgoingActivityTime(void) throw() {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 }
-