X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FHandler.cpp;h=d711f83e4b69a34b62265e129e5a19a031779c7a;hb=e3f60b6b4a178c63ebd6f8915431bfa485a2e601;hp=51e790618f2dabddf49ebaac1a9275cd3ffaa83f;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/core/oam/Handler.cpp b/source/core/oam/Handler.cpp
index 51e7906..d711f83 100644
--- a/source/core/oam/Handler.cpp
+++ b/source/core/oam/Handler.cpp
@@ -1,49 +1,21 @@
-// 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 //
 
 
 // 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>
@@ -82,7 +54,7 @@ const anna::oam::alarm_data_t *anna::oam::Handler::alarmEvent(const anna::oam::M
 
     static char cad_aux[1024];
     vsprintf(cad_aux, alarm.c_str(), argList);
-    std::string trace = module->getClassName();
+    std::string trace = module->getName();
     trace += anna::functions::asString(" | Alarm %s event: %s", (activation ? "activation" : "cancellation"), cad_aux);
     trace += anna::functions::asString(" | Enum type on module: %d", type);
 
@@ -114,12 +86,14 @@ 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
   (
-    std::string trace = module->getClassName();
+    std::string trace = module->getName();
     trace += anna::functions::asString(" | Counter event: %s", base.c_str());
     trace += anna::functions::asString(" | Enum type on module: %d", type);
     trace += anna::functions::asString(" | Amount increased: %d", amount);