X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdiameter.comm%2FLocalServer.cpp;fp=source%2Fdiameter.comm%2FLocalServer.cpp;h=a44524500a89797d71c46b0a8f03028b28f52b58;hp=32247935056d616bbe4291428b266740ab339f98;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp index 3224793..a445245 100644 --- a/source/diameter.comm/LocalServer.cpp +++ b/source/diameter.comm/LocalServer.cpp @@ -46,7 +46,7 @@ LocalServer::LocalServer() : a_lastUsedResource(NULL) {} -void LocalServer::initializeStatisticResources() throw() { +void LocalServer::initializeStatisticResources() { std::string accName = "local server '"; accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second); accName += "' on origin-realm '"; @@ -57,35 +57,35 @@ void LocalServer::initializeStatisticResources() throw() { a_messageStatistics.initialize(accName); } -void LocalServer::resetStatistics() throw() { +void LocalServer::resetStatistics() { a_messageStatistics.getAccumulator()->reset(); } -void LocalServer::updateProcessingTimeStatisticConcept(const double &value, const anna::diameter::CommandId &cid) throw() { +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, const anna::diameter::CommandId &cid) throw() { +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() throw() { return a_serverSessionsRecycler.create(); } -void LocalServer::releaseServerSession(ServerSession *serverSession) throw() { a_serverSessionsRecycler.release(serverSession); } +ServerSession* LocalServer::allocateServerSession() { return a_serverSessionsRecycler.create(); } +void LocalServer::releaseServerSession(ServerSession *serverSession) { 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() { +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( @@ -103,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( @@ -122,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; @@ -153,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; @@ -173,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_FILE_LOCATION); @@ -188,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 { @@ -200,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_FILE_LOCATION); @@ -212,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 @@ -237,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: @@ -285,7 +285,7 @@ ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket & void LocalServer::closeServerSession(ServerSession* serverSession) -throw(anna::RuntimeException) { +noexcept(false) { if(serverSession == NULL) return; @@ -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,7 +383,7 @@ void LocalServer::close() throw(anna::RuntimeException) { closeServerSession(serverSession(it)); } -void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) throw() { +void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "setClassCodeTimeout", ANNA_FILE_LOCATION)); for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) { @@ -395,7 +395,7 @@ void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millise } } -void LocalServer::setMaxConnections(int maxConnections) throw(anna::RuntimeException) { +void LocalServer::setMaxConnections(int maxConnections) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("anna::diameter::comm::LocalServer", "setMaxConnections", ANNA_FILE_LOCATION)); // Negative & initial @@ -450,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()) { @@ -518,7 +518,7 @@ 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)); bool allok = true; @@ -534,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"; @@ -542,7 +542,7 @@ void LocalServer::eventPeerShutdown(const ServerSession* serverSession) throw() ); } -void LocalServer::eventRequestRetransmission(const ServerSession* serverSession, Message *request) throw() { +void LocalServer::eventRequestRetransmission(const ServerSession* serverSession, Message *request) { LOGWARNING( std::string msg(serverSession->asString()); msg += " | eventRequestRetransmission"; @@ -550,7 +550,7 @@ void LocalServer::eventRequestRetransmission(const ServerSession* serverSession, ); } -std::string LocalServer::asString() const throw() { +std::string LocalServer::asString() const { std::string result("diameter::comm::LocalServer { "); result += "Description: "; result += (a_description != "") ? a_description : "undefined"; @@ -577,7 +577,7 @@ std::string LocalServer::asString() const throw() { } -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"); @@ -608,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 ( @@ -622,7 +622,7 @@ void LocalServer::updateIncomingActivityTime() throw() { //------------------------------------------------------------------------------ //------------------------------------ LocalServer::updateOutgoingActivityTime() //------------------------------------------------------------------------------ -void LocalServer::updateOutgoingActivityTime(void) throw() { +void LocalServer::updateOutgoingActivityTime(void) { a_lastOutgoingActivityTime = anna::functions::millisecond(); LOGDEBUG (