X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FServer.cpp;h=4721b10b4c659a9c96808396951ffa3f7fe1e6e7;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=4e9a1fddfab5a58dc03264618ead99e6445f13fc;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp index 4e9a1fd..4721b10 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 @@ -56,7 +28,7 @@ using namespace anna::diameter; using namespace anna::diameter::comm; -void Server::initialize() throw() { +void Server::initialize() { a_parent = NULL; a_engine = NULL; a_clientSessions.clear(); // importante (el recycler creo que no lo tocaba) @@ -64,38 +36,36 @@ 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() { + 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(); +void Server::resetStatistics() { + 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) { + 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) { + a_messageStatistics.process(MessageStatistics::ConceptType::ReceivedMessageSize, cid, value); + LOGDEBUG(anna::Logger::debug(a_messageStatistics.getAccumulator()->asString(), ANNA_FILE_LOCATION)); } -void Server::assertReady() throw(anna::RuntimeException) { +void Server::assertReady() noexcept(false) { if(a_clientSessions.size() != a_maxClientSessions) { std::string msg(asString()); msg += " | Non-configured server: you must add the remaining client-sessions before any operation (bind, send, etc.)"; @@ -105,7 +75,7 @@ void Server::assertReady() throw(anna::RuntimeException) { void Server::addClientSession(int socketId) -throw(anna::RuntimeException) { +noexcept(false) { if(a_clientSessions.size() == a_maxClientSessions) { LOGDEBUG ( @@ -124,7 +94,7 @@ throw(anna::RuntimeException) { a_clientSessions.push_back(s); } -int Server::getOTARequests() const throw() { +int Server::getOTARequests() const { int result = 0; for(std::vector::const_iterator it = begin(); it != end(); it++) @@ -134,13 +104,13 @@ int Server::getOTARequests() const throw() { } -bool Server::send(const Message* message, int socketId) throw(anna::RuntimeException) { +bool Server::send(const Message* message, int socketId) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "send", ANNA_FILE_LOCATION)); assertReady(); 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 @@ -154,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( @@ -173,15 +143,14 @@ bool Server::send(const Message* message, int socketId) throw(anna::RuntimeExcep } -bool Server::broadcast(const Message* message) throw(anna::RuntimeException) { +bool Server::broadcast(const Message* message) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "broadcast", ANNA_FILE_LOCATION)); assertReady(); - const Response* response; bool allok = true; for(std::vector::iterator it = begin(); it != end(); it++) { try { - response = (*it)->send(message); + (*it)->send(message); } catch(anna::RuntimeException &ex) { ex.trace(); allok = false; @@ -192,7 +161,7 @@ bool Server::broadcast(const Message* message) throw(anna::RuntimeException) { } -bool Server::bind() throw(anna::RuntimeException) { +bool Server::bind() noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "bind", ANNA_FILE_LOCATION)); assertReady(); a_deliveryIterator = begin(); @@ -210,7 +179,7 @@ bool Server::bind() throw(anna::RuntimeException) { return result; } -void Server::raiseAutoRecovery(bool autoRecovery) throw(anna::RuntimeException) { +void Server::raiseAutoRecovery(bool autoRecovery) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "raiseAutoRecovery", ANNA_FILE_LOCATION)); assertReady(); a_deliveryIterator = begin(); @@ -219,7 +188,7 @@ void Server::raiseAutoRecovery(bool autoRecovery) throw(anna::RuntimeException) (*it)->setAutoRecovery(autoRecovery); } -void Server::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) throw() { +void Server::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "setClassCodeTimeout", ANNA_FILE_LOCATION)); assertReady(); @@ -234,7 +203,7 @@ void Server::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond // Private close/destroy method -void Server::close(bool destroy) throw(anna::RuntimeException) { +void Server::close(bool destroy) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Server", "close", ANNA_FILE_LOCATION)); if(!a_engine) @@ -247,29 +216,29 @@ void Server::close(bool destroy) throw(anna::RuntimeException) { } -void Server::childIdle() const throw() { +void Server::childIdle() const { // Check father entity idleness: if(idle()) a_parent->childIdle(); } -void Server::hide() throw() { +void Server::hide() { for(std::vector::iterator it = begin(); it != end(); it++) (*it)->hide(); } -void Server::show() throw() { +void Server::show() { for(std::vector::iterator it = begin(); it != end(); it++) (*it)->show(); } -bool Server::hidden() const throw() { +bool Server::hidden() const { for(std::vector::const_iterator it = begin(); it != end(); it++) if((*it)->shown()) return false; return true; } -bool Server::shown() const throw() { +bool Server::shown() const { for(std::vector::const_iterator it = begin(); it != end(); it++) if((*it)->hidden()) return false; @@ -278,7 +247,7 @@ bool Server::shown() const throw() { -std::string Server::socketAsString() const throw() { +std::string Server::socketAsString() const { std::string result = getAddress(); result += ":"; result += anna::functions::asString(getPort()); @@ -286,7 +255,7 @@ std::string Server::socketAsString() const throw() { } -std::string Server::asString() const throw() { +std::string Server::asString() const { std::string result("diameter::comm::Server { "); result += " | Parent Entity: "; result += a_parent->getDescription(); @@ -308,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::const_iterator it = begin(); it != end(); it++) { result += "\n"; @@ -318,7 +287,7 @@ std::string Server::asString() const throw() { return result; } -anna::xml::Node* Server::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* Server::asXML(anna::xml::Node* parent) const { anna::xml::Node* result = parent->createChild("diameter.Server"); result->createAttribute("ParentEntity", a_parent->getDescription()); result->createAttribute("ServerAddress", a_socket.first); @@ -332,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::const_iterator it = begin(); it != end(); it++) @@ -342,27 +311,38 @@ anna::xml::Node* Server::asXML(anna::xml::Node* parent) const throw() { } -void Server::eventPeerShutdown(const ClientSession *clientSession) throw() { - // Inform father server: +void Server::eventPeerShutdown(const ClientSession *clientSession) { + // Inform father entity: a_parent->eventPeerShutdown(clientSession); } -void Server::eventResponse(const Response& response) throw(anna::RuntimeException) { - // Inform father server: +void Server::eventRequestRetransmission(const ClientSession* clientSession, Message *request) { + // Inform father entity: + a_parent->eventRequestRetransmission(clientSession, request); +} + +void Server::eventResponse(const Response& response) noexcept(false) { + // Inform father entity: a_parent->eventResponse(response); } -void Server::eventRequest(ClientSession *clientSession, const anna::DataBlock & request) throw(anna::RuntimeException) { - // Inform father server: +void Server::eventRequest(ClientSession *clientSession, const anna::DataBlock & request) noexcept(false) { + // Inform father entity: a_parent->eventRequest(clientSession, request); } -void Server::eventUnknownResponse(ClientSession *clientSession, const anna::DataBlock & response) throw(anna::RuntimeException) { - // Inform father server: +void Server::eventUnknownResponse(ClientSession *clientSession, const anna::DataBlock & response) noexcept(false) { + // Inform father entity: a_parent->eventUnknownResponse(clientSession, response); } -void Server::availabilityLost() throw() { +void Server::eventDPA(ClientSession *clientSession, const anna::DataBlock & response) noexcept(false) { + // Inform father entity: + a_parent->eventDPA(clientSession, response); +} + + +void Server::availabilityLost() { a_available = false; std::string socket = anna::functions::socketLiteralAsString(a_socket.first, a_socket.second); LOGDEBUG( @@ -380,7 +360,7 @@ void Server::availabilityLost() throw() { } -void Server::availabilityRecovered() throw() { +void Server::availabilityRecovered() { a_available = true; std::string socket = anna::functions::socketLiteralAsString(a_socket.first, a_socket.second); LOGDEBUG( @@ -399,7 +379,7 @@ void Server::availabilityRecovered() throw() { -bool Server::refreshAvailability() throw() { +bool Server::refreshAvailability() { // Here available if(a_available) { // check not-bound state for all client-sessions: bool isolate = true; @@ -431,7 +411,7 @@ bool Server::refreshAvailability() throw() { //------------------------------------------------------------------------------ //---------------------------------------- Server::updateIncomingActivityTime() //------------------------------------------------------------------------------ -void Server::updateIncomingActivityTime() throw() { +void Server::updateIncomingActivityTime() { a_lastIncomingActivityTime = anna::functions::millisecond(); LOGDEBUG ( @@ -446,7 +426,7 @@ void Server::updateIncomingActivityTime() throw() { //------------------------------------------------------------------------------ //---------------------------------------- Server::updateOutgoingActivityTime() //------------------------------------------------------------------------------ -void Server::updateOutgoingActivityTime(void) throw() { +void Server::updateOutgoingActivityTime(void) { a_lastOutgoingActivityTime = anna::functions::millisecond(); LOGDEBUG ( @@ -455,4 +435,3 @@ void Server::updateOutgoingActivityTime(void) throw() { ); a_parent->updateOutgoingActivityTime(); } -