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

diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp
index fde07cb..b43a754 100644
--- a/source/diameter.comm/LocalServer.cpp
+++ b/source/diameter.comm/LocalServer.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #include <anna/diameter.comm/OamModule.hpp>
@@ -71,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,7 +275,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 (*)
+  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->a_engine = a_engine;
   a_serverSessions.insert(serverSession_value_type(key, result));
@@ -333,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 ... */);
@@ -357,7 +331,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();
@@ -560,6 +534,14 @@ void LocalServer::eventPeerShutdown(const ServerSession* serverSession) throw()
   );
 }
 
+void LocalServer::eventRequestRetransmission(const ServerSession* serverSession, Message *request) throw() {
+  LOGWARNING(
+    std::string msg(serverSession->asString());
+    msg += " | eventRequestRetransmission";
+    anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+  );
+}
+
 std::string LocalServer::asString() const throw() {
   std::string result("diameter::comm::LocalServer { ");
   result += "Description: ";
@@ -581,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 += " }";
 }
@@ -606,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++)
@@ -641,4 +623,3 @@ void LocalServer::updateOutgoingActivityTime(void) throw() {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 }
-