X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FCounterScope.cpp;h=76215f0e73257354bd8d9f8d27fa025152c7c05e;hb=3352efcfba854253ead55212939956a00f0635dc;hp=56d6995b2385be79e5108998c130f056315dd20b;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/core/oam/CounterScope.cpp b/source/core/oam/CounterScope.cpp
index 56d6995..76215f0 100644
--- a/source/core/oam/CounterScope.cpp
+++ b/source/core/oam/CounterScope.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #include <string>
@@ -43,7 +15,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 +76,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 +86,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 +96,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 +148,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];
-}
-