X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter.comm%2FServer.hpp;h=8d5dea9b6c7b4fd1e7966a0b90d91d7179907c0a;hb=8a597c7ccbe2986f505fd70258e4b59ecef4166f;hp=f7c623d20332b6d2289561d641661a36ba436a37;hpb=6c4aae8b2e861a6cbca6962611624a5aadadd6ad;p=anna.git

diff --git a/include/anna/diameter.comm/Server.hpp b/include/anna/diameter.comm/Server.hpp
index f7c623d..8d5dea9 100644
--- a/include/anna/diameter.comm/Server.hpp
+++ b/include/anna/diameter.comm/Server.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// 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 the copyright holder 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 //
 
 
 #ifndef anna_diameter_comm_Server_hpp
@@ -41,14 +13,17 @@
 // STL
 #include <string>
 #include <vector>
+#include <map>
 
+// Project
 #include <anna/core/util/Millisecond.hpp>
 #include <anna/core/RuntimeException.hpp>
-
 #include <anna/diameter/defines.hpp>
 #include <anna/config/defines.hpp>
 #include <anna/diameter.comm/ClassCode.hpp>
-#include <anna/statistics/Accumulator.hpp>
+#include <anna/diameter.comm/MessageStatistics.hpp>
+
+
 
 
 namespace anna {
@@ -99,10 +74,8 @@ class Server {
   Engine *a_engine;
 
   // Statistics
-  int a_processing_time__StatisticConceptId;
-  int a_received_message_size__StatisticConceptId;
-  anna::statistics::Accumulator a_statisticsAccumulator;
-  void initializeStatisticConcepts() throw();
+  MessageStatistics a_messageStatistics;
+  void initializeStatisticResources() throw();
   void resetStatistics() throw();
 
   // Availability
@@ -128,6 +101,9 @@ public:
    */
   Server(int maxClientSessions = 1) : a_maxClientSessions(maxClientSessions) { initialize(); }
 
+  /** Destructor */
+  virtual ~Server() {;}
+
 
   /**
   * Add a server to the entity and create all the client-sessions configured at #setSocketsPerDiameterServer within that server.
@@ -295,10 +271,10 @@ public:
 
 
   // Statistics
-  void updateProcessingTimeStatisticConcept(const double &value) throw();
-  void updateReceivedMessageSizeStatisticConcept(const double &value) throw();
-  int getProcessingTimeStatisticConcept() const throw() { return a_processing_time__StatisticConceptId; }
-  int getReceivedMessageSizeStatisticConcept() const throw() { return a_received_message_size__StatisticConceptId; }
+  void updateProcessingTimeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw();
+  void updateReceivedMessageSizeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw();
+//  int getProcessingTimeStatisticConcept() const throw() { return a_processing_time__StatisticConceptId; }
+//  int getReceivedMessageSizeStatisticConcept() const throw() { return a_received_message_size__StatisticConceptId; }
 
 protected:
 
@@ -309,6 +285,13 @@ protected:
   */
   virtual void eventPeerShutdown(const ClientSession*) throw();
 
+  /**
+     Handler about a request retransmission over the session.
+
+     \param request Message retransmitted
+  */
+  virtual void eventRequestRetransmission(const ClientSession*, Message *request) throw();
+
   /**
      Handler for diameter server (client-session) responses
 
@@ -352,4 +335,3 @@ protected:
 }
 
 #endif
-