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

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

diff --git a/source/core/oam/CounterScope.cpp b/source/core/oam/CounterScope.cpp
index 56d6995..c5ac214 100644 (file)
--- a/source/core/oam/CounterScope.cpp
+++ b/source/core/oam/CounterScope.cpp
@@ -43,7 +43,6 @@
 
 #include <anna/timex/Engine.hpp>
 
-#include <anna/core/oam/CounterManager.hpp>
 #include <anna/core/oam/CounterScope.hpp>
 #include <anna/core/oam/Counter.hpp>
 
@@ -105,7 +104,6 @@ throw(RuntimeException) {
   a_counters [counter]->a_value += value;
   a_counters [counter]->a_accValue += value;
   LOGINFORMATION(a_counters [counter]->debug());
-  a_counterManager.activateTimer();
   return a_counters [counter]->a_value;
 }
 
@@ -116,7 +114,6 @@ throw(RuntimeException) {
   a_counters [counter]->a_value = value;
   a_counters [counter]->a_accValue = value;
   LOGINFORMATION(a_counters [counter]->debug());
-  a_counterManager.activateTimer();
   return value;
 }
 
@@ -127,7 +124,7 @@ throw(RuntimeException) {
   return a_counters [counter]->a_value;
 }
 
-Unsigned64 oam::CounterScope::getAccValue(const int counter) const
+U64 oam::CounterScope::getAccValue(const int counter) const
 throw(RuntimeException) {
   test_range(counter);
   test_instance(counter);
@@ -179,25 +176,3 @@ throw(RuntimeException) {
   return result;
 }
 
-/*
-[0x7fbfffea90]: timex::Engine | Callers: timex::Engine::activate [2],timex::Engine::tick [69]
-   [0x79bf60, 2]: oam::CounterManager | Callers: MyInterface::receive [4],anna::oam::CounterManager::record [2]
-      [0x7fbfffea90, 2]: timex::Engine | Callers: timex::Engine::activate [2],timex::Engine::tick [69]
-      ------ Loop detected [ Level=2 | Loop: 3 ] -------
-*/
-oam::CounterScope::Safe::Safe(timex::Engine* ttcc, oam::CounterScope& counterScope, const char* whatis) :
-  a_counterScope(counterScope) {
-  if(ttcc != NULL)
-    a_guards [0] = new Guard(ttcc, "timex::Engine from oam::CounterScope::Safe::Safe");
-  else
-    a_guards [0] = NULL;
-
-  a_guards [1] = new Guard(counterScope, whatis);
-}
-
-oam::CounterScope::Safe::~Safe()
-throw() {
-  delete a_guards [1];
-  delete a_guards [0];
-}
-