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); }
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 ... */);
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));
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);
);
}
-