X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FModule.cpp;h=ede3001f8fd018b2380cd29a43d4458279c9be30;hb=706c5ba5c35199816446453e6e144200cf79265b;hp=99b47c9ee97dba963c6b8530c03d4531fbad6ad0;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git

diff --git a/source/core/oam/Module.cpp b/source/core/oam/Module.cpp
index 99b47c9..ede3001 100644
--- a/source/core/oam/Module.cpp
+++ b/source/core/oam/Module.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 //
 
 
 // Local
@@ -418,7 +390,7 @@ void anna::oam::Module::alarmEvent(bool activation, const int & type, va_list ar
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::activateAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::activateAlarm(const int & type, ...) const throw(anna::RuntimeException) {
+void anna::oam::Module::activateAlarm(int type, ...) const throw(anna::RuntimeException) {
 //   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "activateAlarm", ANNA_FILE_LOCATION));
 
   // Checkings
@@ -444,7 +416,7 @@ void anna::oam::Module::activateAlarm(const int & type, ...) const throw(anna::R
 //------------------------------------------------------------------------------
 //-------------------------------------------------------- Module::cancelAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::cancelAlarm(const int & type, ...) const throw(anna::RuntimeException) {
+void anna::oam::Module::cancelAlarm(int type, ...) const throw(anna::RuntimeException) {
 //   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "cancelAlarm", ANNA_FILE_LOCATION));
 
   // Checkings
@@ -527,7 +499,7 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "recordCounters", ANNA_FILE_LOCATION));
 
   if(a_counterRecorder == NULL)
-    throw RuntimeException("anna::oam::CounterManager has no counter recorder associated", ANNA_FILE_LOCATION);
+    throw RuntimeException("anna::oam::Module has no counter recorder associated", ANNA_FILE_LOCATION);
 
   LOGDEBUG(
     std::string msg("Recording counters | ");
@@ -545,11 +517,9 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
       cscope = scope(scope_it);
       if(cscope == NULL) continue;
 
-      //CounterScope& counterScope(*scope);
-      //Guard csGuard(counterScope, "oam::CounterScope from oam::CounterManager::record");
-      Guard csGuard(cscope, "oam::CounterScope from oam::CounterManager::record");
+      Guard csGuard(cscope, "oam::CounterScope from oam::Module::record");
 
-      for(register int icounter = 0; icounter < CounterScope::MaxCounter; icounter ++) {
+      for(int icounter = 0; icounter < CounterScope::MaxCounter; icounter ++) {
         Counter* counter = cscope->a_counters [icounter];
 
         if(counter == NULL)