-// 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 <anna/diameter.comm/OamModule.hpp>
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) {}
+
+
+void LocalServer::initializeStatisticResources() throw() {
+ std::string accName = "local server '";
+ accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second);
+ accName += "' on 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 LocalServer::resetStatistics() throw() {
- a_statisticsAccumulator.reset();
+ a_messageStatistics.getAccumulator()->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));
+void LocalServer::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 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));
+void LocalServer::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));
}
-
ServerSession* LocalServer::allocateServerSession() throw() { return a_serverSessionsRecycler.create(); }
void LocalServer::releaseServerSession(ServerSession *serverSession) throw() { a_serverSessionsRecycler.release(serverSession); }
LocalServer::serverSession_key LocalServer::getServerSessionKey(const anna::comm::ClientSocket &clientSocket) const throw() {
- return (anna::functions::exclusiveHash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize()));
+ return (anna::functions::hash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize().c_str()));
}
}
// Inform local server (availability changes):
- bool changes = refreshAvailability();
+ refreshAvailability();
+
// OAM
OamModule &oamModule = OamModule::instantiate();
oamModule.count(OamModule::Counter::CreatedConnectionForServerSession);
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 (*)
- // (*) 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->initializeSequences(); // despues de asignar el LocalServer y el socketId (sequences are seed-based by mean exclusive hash)
result->a_engine = a_engine;
a_serverSessions.insert(serverSession_value_type(key, result));
newConnection();
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 ... */);
// #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();
closeServerSession(serverSession(it));
}
+void LocalServer::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) throw() {
+ LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "setClassCodeTimeout", ANNA_FILE_LOCATION));
+
+ for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) {
+ try {
+ serverSession(it)->setClassCodeTimeout(v, millisecond);
+ } catch(anna::RuntimeException &ex) {
+ ex.trace();
+ }
+ }
+}
void LocalServer::setMaxConnections(int maxConnections) throw(anna::RuntimeException) {
LOGMETHOD(anna::TraceMethod tttm("anna::diameter::comm::LocalServer", "setMaxConnections", ANNA_FILE_LOCATION));
// Send:
try {
- 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) {
ex.trace();
bool LocalServer::broadcast(const Message* message) throw(anna::RuntimeException) {
LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "broadcast", ANNA_FILE_LOCATION));
- const Response* response;
bool allok = true;
for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) {
try {
- response = serverSession(it)->send(message);
+ serverSession(it)->send(message);
} catch(anna::RuntimeException &ex) {
ex.trace();
allok = false;
);
}
+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: ";
result += " | Last Outgoing Activity Time: ";
result += a_lastOutgoingActivityTime.asString();
// result += "\n";
-// result += a_statisticsAccumulator.asString();
+// result += a_messageStatistics.getAccumulator()->asString();
// ServerSessions only in xml
return result += " }";
}
result->createAttribute("LastIncomingActivityTime", a_lastIncomingActivityTime.asString());
result->createAttribute("LastOutgoingActivityTime", a_lastOutgoingActivityTime.asString());
// Statistics
- anna::xml::Node* stats = result->createChild("Statistics");
- a_statisticsAccumulator.asXML(stats);
+ anna::xml::Node* stats = result->createChild("MessageStatistics");
+ a_messageStatistics.getAccumulator()->asXML(stats);
anna::xml::Node* serverSessions = result->createChild("ServerSessions"); // LocalServer.ServerSessions
for(const_serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++)
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
}
-
projects / anna.git / blobdiff