Remove core-comm dependency through CounterManager/timex in core/oam subsystem. Basic...

[anna.git] / source / core / oam / Handler.cpp

diff --git a/source/core/oam/Handler.cpp b/source/core/oam/Handler.cpp
index 51e7906..341f5c5 100644 (file)
--- a/source/core/oam/Handler.cpp
+++ b/source/core/oam/Handler.cpp
@@ -37,13 +37,13 @@
 // Local
 #include <anna/core/oam/Module.hpp>
 #include <anna/core/oam/Handler.hpp>
+#include <anna/core/oam/CounterScope.hpp>
 #include <anna/core/functions.hpp>
 
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/tracing/TraceWriter.hpp>
 #include <anna/core/tracing/TraceMethod.hpp>
 #include <anna/core/functions.hpp>
-#include <anna/core/oam/CounterManager.hpp>
 
 // Standard
 #include <stdarg.h>
@@ -114,8 +114,10 @@ const anna::oam::counter_data_t *anna::oam::Handler::counterEvent(const anna::oa
   std::string base = result ? result->Description : module->getDefaultInternalCounterDescription(type);
 
   // Count if registered
-  if(result)
-    anna::oam::CounterManager::instantiate().count(module->getActiveCounterScope()->getId(), result->Offset, amount);
+  if(result) {
+    anna::oam::CounterScope *nc_cs = const_cast <anna::oam::CounterScope*>(module->getActiveCounterScope());
+    nc_cs->increment(result->Offset, amount);
+  }
 
   LOGDEBUG
   (