X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdiameter.comm%2FApplicationMessageOamModule.cpp;h=d167d716cb6978d0dcf9462f181c8ff0dc2d9c93;hp=44a235f99272d4253f5851f4171608090179db14;hb=30def5757c5b3411f77fff62a163241ecc616337;hpb=a4a2ff4e20ddc4c6de7f2d3efd3acfb16c0d91c1
diff --git a/source/diameter.comm/ApplicationMessageOamModule.cpp b/source/diameter.comm/ApplicationMessageOamModule.cpp
index 44a235f..d167d71 100644
--- a/source/diameter.comm/ApplicationMessageOamModule.cpp
+++ b/source/diameter.comm/ApplicationMessageOamModule.cpp
@@ -47,7 +47,7 @@ void anna::diameter::comm::ApplicationMessageOamModule::createStackCounterScope(
a_stackMap[stackId] = scopeId;
}
-void anna::diameter::comm::ApplicationMessageOamModule::count (int messageCode, unsigned int stackId, const int & type, const int & amount) throw(anna::RuntimeException) {
+void anna::diameter::comm::ApplicationMessageOamModule::count (int messageCode, int resultCode, unsigned int stackId, const int & type, const int & amount) throw(anna::RuntimeException) {
// Optimization:
// Checkings
@@ -64,27 +64,35 @@ void anna::diameter::comm::ApplicationMessageOamModule::count (int messageCode,
anna::Guard guard(a_mutex, "ApplicationMessageOamModule::count"); // counter scope switch
- std::map::const_iterator stackMap_it = a_stackMap.find(stackId);
+ int scopeId = monoStackScopeId();
+ if (scopeId == -1) {
+ std::map::const_iterator stackMap_it = a_stackMap.find(stackId);
- if (stackMap_it == a_stackMap.end()) {
- LOGDEBUG(anna::Logger::debug(anna::functions::asString("Unregistered stack id %lu", stackId), ANNA_FILE_LOCATION));
- return;
+ if (stackMap_it == a_stackMap.end()) {
+ LOGDEBUG(anna::Logger::debug(anna::functions::asString("Unregistered stack id %lu", stackId), ANNA_FILE_LOCATION));
+ return;
+ }
+
+ scopeId = stackMap_it->second;
}
// Select counter scope
- setActiveCounterScope(stackMap_it->second);
-
- std::map::const_iterator messageMap_it = a_messageMap.find(messageCode);
- int baseOffset = messageMap_it->second;
+ setActiveCounterScope(scopeId);
+
+ // Build event id: _
+ std::string eventId = anna::functions::asString("%d%d", messageCode, resultCode);
+
+ std::map::const_iterator eventMap_it = a_eventMap.find(eventId);
+ int baseOffset = eventMap_it->second;
- if (messageMap_it == a_messageMap.end()) {
+ if (eventMap_it == a_eventMap.end()) {
int capacity = anna::oam::CounterScope::MaxCounter / getCounterTypes();
- if (a_messageMap.size() > capacity) {
+ if (a_eventMap.size() > capacity) {
LOGDEBUG(anna::Logger::debug(anna::functions::asString("No more holes to register new application message counters in the scope (up to %d message codes)", capacity), ANNA_FILE_LOCATION));
return;
}
- baseOffset = getCounterTypes() * a_messageMap.size(); // N counter types for each message code
- a_messageMap[messageCode] = baseOffset;
+ baseOffset = getCounterTypes() * a_eventMap.size(); // N counter types for each message code
+ a_eventMap[eventId] = baseOffset;
// Counter name:
std::string counterNamePrefix = anna::functions::asString("ApplicationMessageCode_%d", messageCode); // default
@@ -107,8 +115,14 @@ void anna::diameter::comm::ApplicationMessageOamModule::count (int messageCode,
}
if (counterNamePrefix[counterNamePrefix.size() - 1] != '-') counterNamePrefix += "-";
- for (int offset = 0; offset < getCounterTypes(); offset++)
- registerCounter(baseOffset + offset, counterNamePrefix + getDefaultInternalCounterDescription(offset), baseOffset + offset);
+ std::string counterName;
+ // register only count event:
+ //for (int offset = 0; offset < getCounterTypes(); offset++) {
+ int offset = baseOffset + type;
+ counterName = counterNamePrefix + getDefaultInternalCounterDescription(offset);
+ if (resultCode != -1) counterName += anna::functions::asString("-ResultCode_%d", resultCode);
+ registerCounter(baseOffset + offset, counterName, baseOffset + offset);
+ //}
}
// Count