X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FServer.cpp;h=32b3efa2daee15f9fcc6c78176cfcee42c495d0c;hb=7ee10b64f4c116460ffef5784eb9ef87d3f2339c;hp=4b96c5ebf69413e14ec0bb8441363a0081ef648b;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git

diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp
index 4b96c5e..32b3efa 100644
--- a/source/diameter.comm/Server.cpp
+++ b/source/diameter.comm/Server.cpp
@@ -36,34 +36,32 @@ void Server::initialize() throw() {
   a_maxClientSessions = 1; // mono client connection
   a_lastIncomingActivityTime = (anna::Millisecond)0;
   a_lastOutgoingActivityTime = (anna::Millisecond)0;
-  a_statisticsAccumulator.reset();
   a_lastUsedResource = NULL;
 }
 
-void Server::initializeStatisticConcepts() throw() {
-  // 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;
-  // 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::initializeStatisticResources() throw() {
+  std::string accName = "remote server '";
+  accName += anna::functions::socketLiteralAsString(a_socket.first, a_socket.second);
+  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_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));
 }
 
 
@@ -126,7 +124,7 @@ bool Server::send(const Message* message, int socketId) throw(anna::RuntimeExcep
 
     try {
       // Send:
-      const Response* response = a_lastUsedResource->send(message);
+      a_lastUsedResource->send(message);
       return true; // no matter if response is NULL (answers, i.e.) or not.
     } catch(anna::RuntimeException &ex) {
       LOGDEBUG(
@@ -148,12 +146,11 @@ bool Server::send(const Message* message, int socketId) throw(anna::RuntimeExcep
 bool Server::broadcast(const Message* message) throw(anna::RuntimeException) {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "broadcast", ANNA_FILE_LOCATION));
   assertReady();
-  const Response* response;
   bool allok = true;
 
   for(std::vector<ClientSession*>::iterator it = begin(); it != end(); it++) {
     try {
-      response = (*it)->send(message);
+      (*it)->send(message);
     } catch(anna::RuntimeException &ex) {
       ex.trace();
       allok = false;
@@ -280,7 +277,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";
@@ -304,7 +301,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++)
@@ -315,27 +312,32 @@ anna::xml::Node* Server::asXML(anna::xml::Node* parent) const throw() {
 
 
 void Server::eventPeerShutdown(const ClientSession *clientSession) throw() {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventPeerShutdown(clientSession);
 }
 
+void Server::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() {
+  // Inform father entity:
+  a_parent->eventRequestRetransmission(clientSession, request);
+}
+
 void Server::eventResponse(const Response& response) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventResponse(response);
 }
 
 void Server::eventRequest(ClientSession *clientSession, const anna::DataBlock & request) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventRequest(clientSession, request);
 }
 
 void Server::eventUnknownResponse(ClientSession *clientSession, const anna::DataBlock & response) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventUnknownResponse(clientSession, response);
 }
 
 void Server::eventDPA(ClientSession *clientSession, const anna::DataBlock & response) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventDPA(clientSession, response);
 }
 
@@ -433,4 +435,3 @@ void Server::updateOutgoingActivityTime(void) throw() {
   );
   a_parent->updateOutgoingActivityTime();
 }
-