X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FModule.cpp;h=b7baf2854c960d0d3ce18553d0b00ba717a56ab9;hb=7ee10b64f4c116460ffef5784eb9ef87d3f2339c;hp=9da1d0e288d5d2d5bad7a099dcd7a78d4122c61c;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/core/oam/Module.cpp b/source/core/oam/Module.cpp
index 9da1d0e..b7baf28 100644
--- a/source/core/oam/Module.cpp
+++ b/source/core/oam/Module.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness 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
@@ -284,7 +256,7 @@ void anna::oam::Module::initializeCounterScope(const int & scopeId, const std::s
   anna::Logger::warning("This is not the first initialized scope. Perhaps you should provide specific description better than general module name ...", ANNA_FILE_LOCATION);
   }
   );
-  const char * c_description = (missingScopeDescription ? getClassName() : description.c_str());
+  const char * c_description = (missingScopeDescription ? getName() : description.c_str());
   a_active_counter_scope = new CounterScope(scopeId, c_description);
   a_scopes[scopeId] = a_active_counter_scope;
 }
@@ -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
@@ -426,7 +398,7 @@ void anna::oam::Module::activateAlarm(const int & type, ...) const throw(anna::R
     LOGDEBUG
     (
       std::string msg = "Alarm activation ignored over module '";
-      msg += getClassName();
+      msg += getName();
       msg += "': alarms are disabled";
       anna::Logger::debug(msg, ANNA_FILE_LOCATION);
     );
@@ -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
@@ -452,7 +424,7 @@ void anna::oam::Module::cancelAlarm(const int & type, ...) const throw(anna::Run
     LOGDEBUG
     (
       std::string msg = "Alarm cancellation ignored over module '";
-      msg += getClassName();
+      msg += getName();
       msg += "': alarms are disabled";
       anna::Logger::debug(msg, ANNA_FILE_LOCATION);
     );
@@ -478,7 +450,7 @@ void anna::oam::Module::count(const int & type, const int & amount) throw(anna::
     LOGDEBUG
     (
       std::string msg = "Count operation ignored over module '";
-      msg += getClassName();
+      msg += getName();
       msg += "': counters are disabled";
       anna::Logger::debug(msg, ANNA_FILE_LOCATION);
     );
@@ -537,7 +509,6 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
   RecordingGuard guard(this);
 
   a_counterRecorder->open();
-  Counter* counter = NULL;
   CounterScope* cscope = NULL;
 
   try {
@@ -547,7 +518,7 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
 
       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)
@@ -574,7 +545,7 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
 std::string anna::oam::Module::asString(void) const throw() {
   std::string trace;
   trace = "Module name: '";
-  trace += getClassName();
+  trace += getName();
   trace += "'";
   trace += "\n\nCOUNTERS"; trace += "\n--------";
   trace += "\nScoped counters "; trace += a_counters_enabled ? "Enabled" : "Disabled";
@@ -635,7 +606,7 @@ std::string anna::oam::Module::asString(void) const throw() {
 //------------------------------------------------------------------------------
 anna::xml::Node* anna::oam::Module::asXML(anna::xml::Node* parent) const throw() {
   anna::xml::Node* result = parent->createChild("oam.Module");
-  result->createAttribute("Name", getClassName());
+  result->createAttribute("Name", getName());
   result->createAttribute("Counters", a_counters_enabled ? "Enabled" : "Disabled");
   anna::xml::Node* registeredCounterScopes = result->createChild("RegisteredCounterScopes");