X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FModule.cpp;fp=source%2Fcore%2Foam%2FModule.cpp;h=4466ca5234bcd781a8f2a887f219a8f71ce33057;hb=f1060689be5a576ea46b9f95a91d19cc10444fba;hp=ede3001f8fd018b2380cd29a43d4458279c9be30;hpb=1ccc9d9121c1c5d2bb009fedbc124aebc94bc56c;p=anna.git diff --git a/source/core/oam/Module.cpp b/source/core/oam/Module.cpp index ede3001..4466ca5 100644 --- a/source/core/oam/Module.cpp +++ b/source/core/oam/Module.cpp @@ -256,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; } @@ -398,7 +398,7 @@ void anna::oam::Module::activateAlarm(int type, ...) const throw(anna::RuntimeEx LOGDEBUG ( std::string msg = "Alarm activation ignored over module '"; - msg += getClassName(); + msg += getName(); msg += "': alarms are disabled"; anna::Logger::debug(msg, ANNA_FILE_LOCATION); ); @@ -424,7 +424,7 @@ void anna::oam::Module::cancelAlarm(int type, ...) const throw(anna::RuntimeExce LOGDEBUG ( std::string msg = "Alarm cancellation ignored over module '"; - msg += getClassName(); + msg += getName(); msg += "': alarms are disabled"; anna::Logger::debug(msg, ANNA_FILE_LOCATION); ); @@ -450,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); ); @@ -546,7 +546,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"; @@ -607,7 +607,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");