App counters including message name and result code if proceed

[anna.git] / source / diameter.comm / ApplicationMessageOamModule.cpp

diff --git a/source/diameter.comm/ApplicationMessageOamModule.cpp b/source/diameter.comm/ApplicationMessageOamModule.cpp
index 44a235f..d167d71 100644 (file)
--- 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<unsigned int /* stack id */, int /* scope id */>::const_iterator stackMap_it = a_stackMap.find(stackId);
+  int scopeId = monoStackScopeId();
+  if (scopeId == -1) {
+    std::map<unsigned int /* stack id */, int /* scope id */>::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<int /* message code */, int /* base offset */>::const_iterator messageMap_it = a_messageMap.find(messageCode);
-  int baseOffset = messageMap_it->second;
+  setActiveCounterScope(scopeId);
+
+  // Build event id: <message code>_<result code>
+  std::string eventId = anna::functions::asString("%d%d", messageCode, resultCode); 
+
+  std::map<std::string /* event id */, int /* base offset */>::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