projects
/
anna.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Programming answers in double ended queue. Fix word "Coding" by "Encoding"
[anna.git]
/
source
/
core
/
oam
/
Module.cpp
diff --git
a/source/core/oam/Module.cpp
b/source/core/oam/Module.cpp
index
99b47c9
..
f0fad25
100644
(file)
--- a/
source/core/oam/Module.cpp
+++ b/
source/core/oam/Module.cpp
@@
-1,8
+1,8
@@
-// ANNA - Anna is Not
'N'
Anymore
+// ANNA - Anna is Not
Nothingness
Anymore
//
// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
//
//
// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
//
-// http
s://bitbucket.org/testillano/anna
+// http
://redmine.teslayout.com/projects/anna-suite
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@
-14,7
+14,7
@@
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// 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
+// *
Neither the name of the copyright holder
nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
@@
-418,7
+418,7
@@
void anna::oam::Module::alarmEvent(bool activation, const int & type, va_list ar
//------------------------------------------------------------------------------
//------------------------------------------------------ Module::activateAlarm()
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
//------------------------------------------------------ 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
// LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "activateAlarm", ANNA_FILE_LOCATION));
// Checkings
@@
-444,7
+444,7
@@
void anna::oam::Module::activateAlarm(const int & type, ...) const throw(anna::R
//------------------------------------------------------------------------------
//-------------------------------------------------------- Module::cancelAlarm()
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
//-------------------------------------------------------- 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
// LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "cancelAlarm", ANNA_FILE_LOCATION));
// Checkings
@@
-527,7
+527,7
@@
void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "recordCounters", ANNA_FILE_LOCATION));
if(a_counterRecorder == NULL)
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 | ");
LOGDEBUG(
std::string msg("Recording counters | ");
@@
-545,11
+545,9
@@
void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
cscope = scope(scope_it);
if(cscope == NULL) continue;
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)
Counter* counter = cscope->a_counters [icounter];
if(counter == NULL)