X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FServer.cpp;h=1ba83567fe36c4c448c9e48f87469a813e978183;hb=028006fc5ee34967fcfffff24a2b1c8b410c26c3;hp=4e9a1fddfab5a58dc03264618ead99e6445f13fc;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp index 4e9a1fd..1ba8356 100644 --- a/source/diameter.comm/Server.cpp +++ b/source/diameter.comm/Server.cpp @@ -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 // #include @@ -64,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->getOriginRealm() : "unknown"; // it should be known (createServer) + accName += "' and origin-host '"; + accName += a_engine ? a_engine->getOriginHost() : "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)); } @@ -140,7 +110,7 @@ bool Server::send(const Message* message, int socketId) throw(anna::RuntimeExcep bool fixedSocket = (socketId != -1); int clientSessions = getNumberOfClientSessions(); - for(register int k = 0; k < clientSessions; k++) { // try round-robin only over one cycle, + for(int k = 0; k < clientSessions; k++) { // try round-robin only over one cycle, // no matter where you are: don't repeat same socket if(fixedSocket) a_lastUsedResource = a_engine->findClientSession(a_socket.first /*ip*/, a_socket.second /*port*/, socketId); // exception if not found @@ -308,7 +278,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::const_iterator it = begin(); it != end(); it++) { result += "\n"; @@ -332,7 +302,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::const_iterator it = begin(); it != end(); it++) @@ -343,25 +313,36 @@ 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 entity: + a_parent->eventDPA(clientSession, response); +} + + void Server::availabilityLost() throw() { a_available = false; std::string socket = anna::functions::socketLiteralAsString(a_socket.first, a_socket.second); @@ -455,4 +436,3 @@ void Server::updateOutgoingActivityTime(void) throw() { ); a_parent->updateOutgoingActivityTime(); } -