X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FLocalServer.cpp;h=a44524500a89797d71c46b0a8f03028b28f52b58;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=293cc83576582fe5c01ab319b78b10bcc23739af;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git

diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp
index 293cc83..a445245 100644
--- a/source/diameter.comm/LocalServer.cpp
+++ b/source/diameter.comm/LocalServer.cpp
@@ -43,53 +43,49 @@ LocalServer::LocalServer() :
   a_category(0),
   a_lock(false),
   a_available(false),
-  a_lastUsedResource(NULL) {
-  a_statisticsAccumulator.reset();
+  a_lastUsedResource(NULL) {}
+
+
+void LocalServer::initializeStatisticResources() {
+  std::string accName = "local server '";
+  accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second);
+  accName += "' on 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 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 */);
-}
-
-void LocalServer::resetStatistics() throw() {
-  a_statisticsAccumulator.reset();
+void LocalServer::resetStatistics() {
+  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) {
+  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) {
+  a_messageStatistics.process(MessageStatistics::ConceptType::ReceivedMessageSize, cid, value);
+  LOGDEBUG(anna::Logger::debug(a_messageStatistics.getAccumulator()->asString(), ANNA_FILE_LOCATION));
 }
 
+ServerSession* LocalServer::allocateServerSession() { return a_serverSessionsRecycler.create(); }
+void LocalServer::releaseServerSession(ServerSession *serverSession) { a_serverSessionsRecycler.release(serverSession); }
 
-ServerSession* LocalServer::allocateServerSession() throw() { return a_serverSessionsRecycler.create(); }
-void LocalServer::releaseServerSession(ServerSession *serverSession) throw() { a_serverSessionsRecycler.release(serverSession); }
 
-
-LocalServer::serverSession_iterator LocalServer::serverSession_find(const serverSession_key &key) throw() {
+LocalServer::serverSession_iterator LocalServer::serverSession_find(const serverSession_key &key) {
   return a_serverSessions.find(key);
 }
 
 
-LocalServer::serverSession_key LocalServer::getServerSessionKey(const anna::comm::ClientSocket &clientSocket) const throw() {
-  return (anna::functions::exclusiveHash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize()));
+LocalServer::serverSession_key LocalServer::getServerSessionKey(const anna::comm::ClientSocket &clientSocket) const {
+  return (anna::functions::hash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize().c_str()));
 }
 
 
-void LocalServer::availabilityLost() throw() {
+void LocalServer::availabilityLost() {
   a_available = false;
   std::string socket = anna::functions::socketLiteralAsString(a_key.first, a_key.second);
   LOGDEBUG(
@@ -107,7 +103,7 @@ void LocalServer::availabilityLost() throw() {
 }
 
 
-void LocalServer::availabilityRecovered() throw() {
+void LocalServer::availabilityRecovered() {
   a_available = true;
   std::string socket = anna::functions::socketLiteralAsString(a_key.first, a_key.second);
   LOGDEBUG(
@@ -126,7 +122,7 @@ void LocalServer::availabilityRecovered() throw() {
 
 
 
-bool LocalServer::refreshAvailability() throw() {
+bool LocalServer::refreshAvailability() {
   // Here available
   if(a_available) {  // check not-bound state for all server-sessions:
 //      bool isolate = true;
@@ -157,7 +153,7 @@ bool LocalServer::refreshAvailability() throw() {
 }
 
 
-void LocalServer::enable(bool unlock) throw(anna::RuntimeException) {
+void LocalServer::enable(bool unlock) noexcept(false) {
   // Unlock ?
   if(unlock) a_lock = false;
 
@@ -177,7 +173,7 @@ void LocalServer::enable(bool unlock) throw(anna::RuntimeException) {
   attach();
 }
 
-void LocalServer::attach() throw() {
+void LocalServer::attach() {
   try {
     // Attach to communicator
     anna::comm::Communicator * communicator = anna::app::functions::component <anna::comm::Communicator> (ANNA_FILE_LOCATION);
@@ -192,7 +188,7 @@ void LocalServer::attach() throw() {
   }
 }
 
-void LocalServer::attachPlanning() throw() {
+void LocalServer::attachPlanning() {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "attachPlanning", ANNA_FILE_LOCATION));
 
   try {
@@ -204,7 +200,7 @@ void LocalServer::attachPlanning() throw() {
 }
 
 
-void LocalServer::disable(bool lock) throw(anna::RuntimeException) {
+void LocalServer::disable(bool lock) noexcept(false) {
   // Permanent ?
   a_lock = lock;
   anna::comm::Communicator * communicator = anna::app::functions::component <anna::comm::Communicator> (ANNA_FILE_LOCATION);
@@ -216,13 +212,13 @@ void LocalServer::disable(bool lock) throw(anna::RuntimeException) {
 }
 
 
-void LocalServer::lostConnection() throw() {
+void LocalServer::lostConnection() {
   a_currentConnections--;
   enable();
 }
 
 
-void LocalServer::newConnection() throw(anna::RuntimeException) {
+void LocalServer::newConnection() noexcept(false) {
   a_currentConnections++;
 
   // Check capacity
@@ -232,7 +228,8 @@ void LocalServer::newConnection() throw(anna::RuntimeException) {
   }
 
   // Inform local server (availability changes):
-  bool changes = refreshAvailability();
+  refreshAvailability();
+
   // OAM
   OamModule &oamModule = OamModule::instantiate();
   oamModule.count(OamModule::Counter::CreatedConnectionForServerSession);
@@ -240,7 +237,7 @@ void LocalServer::newConnection() throw(anna::RuntimeException) {
 
 
 
-ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket &clientSocket) throw(anna::RuntimeException) {
+ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket &clientSocket) noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "createServerSession", ANNA_FILE_LOCATION));
   ServerSession* result(NULL);
   // First erase deprecated ones:
@@ -277,8 +274,7 @@ ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket &
   result->setClientSocket((anna::comm::ClientSocket*)(&clientSocket));
   result->a_parent = this;
   result->a_socketId = key; // de momento...
-  result->initializeSequences(); // después de asignar el LocalServer y el socketId (*)
-  // (*) Las secuencias se basan en la semilla:    srand(::time(NULL) + anna::functions::exclusiveHash(anna::functions::asString("%s:%d|%d", getAddress().c_str(), getPort(), a_socketId)));
+  result->initializeSequences(); // despues de asignar el LocalServer y el socketId (sequences are seed-based by mean exclusive hash)
   result->a_engine = a_engine;
   a_serverSessions.insert(serverSession_value_type(key, result));
   newConnection();
@@ -289,7 +285,7 @@ ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket &
 
 
 void LocalServer::closeServerSession(ServerSession* serverSession)
-throw(anna::RuntimeException) {
+noexcept(false) {
   if(serverSession == NULL)
     return;
 
@@ -305,6 +301,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 ... */);
@@ -329,7 +329,7 @@ throw(anna::RuntimeException) {
   //   #9  0x000000000048d288 in anna::diameter::comm::ServerSession::finalize (this=0xc37a00) at comm.db/diameter.comm.ServerSession.cc:510
   //   #10 0x0000000000494e4f in anna::diameter::comm::ServerSessionReceiver::eventBreakLocalConnection (this=0xc119c0, clientSocket=@0xb0ea00)
   // SOLUCION: no borrar aqui, marcar como "deprecated". Este estado no se necesita realmente puesto que nadie volvera a usar este recurso.
-  // Pero simplemente se podria usar para purgar mediante temporizacion (entonces sí se haría el erase)
+  // Pero simplemente se podria usar para purgar mediante temporizacion (entonces s� se har�a el erase)
   serverSession->a_deprecated = true;
   // WE WILL ERASE AT createServerSession
   a_deliveryIterator = serverSession_begin();
@@ -338,7 +338,7 @@ throw(anna::RuntimeException) {
 
 
 ServerSession* LocalServer::findServerSession(int socketId, anna::Exception::Mode::_v emode)
-throw(anna::RuntimeException) {
+noexcept(false) {
   serverSession_iterator ii = serverSession_find(socketId);
 
   if(ii != serverSession_end())
@@ -360,12 +360,12 @@ throw(anna::RuntimeException) {
 }
 
 ServerSession* LocalServer::findServerSession(const anna::comm::ClientSocket &clientSocket, anna::Exception::Mode::_v emode)
-throw(anna::RuntimeException) {
+noexcept(false) {
   return findServerSession(getServerSessionKey(clientSocket), emode);
 }
 
 
-int LocalServer::getOTARequests() const throw() {
+int LocalServer::getOTARequests() const {
   int result = 0;
 
   for(const_serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++)
@@ -374,7 +374,7 @@ int LocalServer::getOTARequests() const throw() {
   return result;
 }
 
-void LocalServer::close() throw(anna::RuntimeException) {
+void LocalServer::close() noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "close", ANNA_FILE_LOCATION));
   // Close listener (permanently to avoid reopening when local connections are being deleted):
   disable(true /* lock */);
@@ -383,8 +383,19 @@ void LocalServer::close() throw(anna::RuntimeException) {
     closeServerSession(serverSession(it));
 }
 
+void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) {
+  LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "setClassCodeTimeout", ANNA_FILE_LOCATION));
 
-void LocalServer::setMaxConnections(int maxConnections) throw(anna::RuntimeException) {
+  for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) {
+    try {
+      serverSession(it)->setClassCodeTimeout(v, millisecond);
+    } catch(anna::RuntimeException &ex) {
+      ex.trace();
+    }
+  }
+}
+
+void LocalServer::setMaxConnections(int maxConnections) noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("anna::diameter::comm::LocalServer", "setMaxConnections", ANNA_FILE_LOCATION));
 
   // Negative & initial
@@ -439,7 +450,7 @@ void LocalServer::setMaxConnections(int maxConnections) throw(anna::RuntimeExcep
 }
 
 
-bool LocalServer::send(const Message* message, int socketId) throw(anna::RuntimeException) {
+bool LocalServer::send(const Message* message, int socketId) noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "send", ANNA_FILE_LOCATION));
 
   if(!isAvailable()) {
@@ -491,7 +502,7 @@ bool LocalServer::send(const Message* message, int socketId) throw(anna::Runtime
 
   // Send:
   try {
-    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) {
     ex.trace();
@@ -507,14 +518,13 @@ bool LocalServer::send(const Message* message, int socketId) throw(anna::Runtime
 }
 
 
-bool LocalServer::broadcast(const Message* message) throw(anna::RuntimeException) {
+bool LocalServer::broadcast(const Message* message) noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "broadcast", ANNA_FILE_LOCATION));
-  const Response* response;
   bool allok = true;
 
   for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) {
     try {
-      response = serverSession(it)->send(message);
+      serverSession(it)->send(message);
     } catch(anna::RuntimeException &ex) {
       ex.trace();
       allok = false;
@@ -524,7 +534,7 @@ bool LocalServer::broadcast(const Message* message) throw(anna::RuntimeException
   return allok;
 }
 
-void LocalServer::eventPeerShutdown(const ServerSession* serverSession) throw() {
+void LocalServer::eventPeerShutdown(const ServerSession* serverSession) {
   LOGWARNING(
     std::string msg(serverSession->asString());
     msg += " | eventPeerShutdown";
@@ -532,7 +542,15 @@ void LocalServer::eventPeerShutdown(const ServerSession* serverSession) throw()
   );
 }
 
-std::string LocalServer::asString() const throw() {
+void LocalServer::eventRequestRetransmission(const ServerSession* serverSession, Message *request) {
+  LOGWARNING(
+    std::string msg(serverSession->asString());
+    msg += " | eventRequestRetransmission";
+    anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+  );
+}
+
+std::string LocalServer::asString() const {
   std::string result("diameter::comm::LocalServer { ");
   result += "Description: ";
   result += (a_description != "") ? a_description : "undefined";
@@ -553,13 +571,13 @@ 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 += " }";
 }
 
 
-anna::xml::Node* LocalServer::asXML(anna::xml::Node* parent) const throw() {
+anna::xml::Node* LocalServer::asXML(anna::xml::Node* parent) const {
   anna::xml::Node* result = parent->createChild("diameter.LocalServer");
   result->createAttribute("Description", (a_description != "") ? a_description : "undefined");
   result->createAttribute("Available", a_available ? "yes" : "no");
@@ -577,8 +595,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++)
@@ -590,7 +608,7 @@ anna::xml::Node* LocalServer::asXML(anna::xml::Node* parent) const throw() {
 //------------------------------------------------------------------------------
 //------------------------------------ LocalServer::updateIncomingActivityTime()
 //------------------------------------------------------------------------------
-void LocalServer::updateIncomingActivityTime() throw() {
+void LocalServer::updateIncomingActivityTime() {
   a_lastIncomingActivityTime = anna::functions::millisecond();
   LOGDEBUG
   (
@@ -604,7 +622,7 @@ void LocalServer::updateIncomingActivityTime() throw() {
 //------------------------------------------------------------------------------
 //------------------------------------ LocalServer::updateOutgoingActivityTime()
 //------------------------------------------------------------------------------
-void LocalServer::updateOutgoingActivityTime(void) throw() {
+void LocalServer::updateOutgoingActivityTime(void) {
   a_lastOutgoingActivityTime = anna::functions::millisecond();
   LOGDEBUG
   (
@@ -613,4 +631,3 @@ void LocalServer::updateOutgoingActivityTime(void) throw() {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 }
-