[cig-commits] r21940 - in short/3D/PyLith/trunk: libsrc/pylith/utils unittests/libtests/utils
brad at geodynamics.org
brad at geodynamics.org
Thu Apr 25 10:14:11 PDT 2013
Author: brad
Date: 2013-04-25 10:14:11 -0700 (Thu, 25 Apr 2013)
New Revision: 21940
Modified:
short/3D/PyLith/trunk/libsrc/pylith/utils/EventLogger.cc
short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc
Log:
Code cleanup.
Modified: short/3D/PyLith/trunk/libsrc/pylith/utils/EventLogger.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/utils/EventLogger.cc 2013-04-25 16:59:42 UTC (rev 21939)
+++ short/3D/PyLith/trunk/libsrc/pylith/utils/EventLogger.cc 2013-04-25 17:14:11 UTC (rev 21940)
@@ -20,6 +20,7 @@
#include "EventLogger.hh" // Implementation of class methods
+#include "petscerror.h" // USES PYLITH_METHOD_BEGIN/END
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
@@ -44,6 +45,8 @@
void
pylith::utils::EventLogger::initialize(void)
{ // initialize
+ PYLITH_METHOD_BEGIN;
+
if (_className == "")
throw std::logic_error("Must set logging class name before "
"initializaing EventLogger.");
@@ -55,7 +58,9 @@
msg << "Could not register logging class '" << _className << "'.";
throw std::runtime_error(msg.str());
} // if
- assert(0 != _classId);
+ assert(_classId);
+
+ PYLITH_METHOD_END;
} // initialize
// ----------------------------------------------------------------------
@@ -63,7 +68,9 @@
int
pylith::utils::EventLogger::registerEvent(const char* name)
{ // registerEvent
- assert(0 != _classId);
+ PYLITH_METHOD_BEGIN;
+
+ assert(_classId);
int id = 0;
PetscErrorCode err = PetscLogEventRegister(name, _classId, &id);
if (err) {
@@ -73,7 +80,7 @@
throw std::runtime_error(msg.str());
} // if
_events[name] = id;
- return id;
+ PYLITH_METHOD_RETURN(id);
} // registerEvent
// ----------------------------------------------------------------------
@@ -81,6 +88,8 @@
int
pylith::utils::EventLogger::eventId(const char* name)
{ // eventId
+ PYLITH_METHOD_BEGIN;
+
map_event_type::iterator iter = _events.find(name);
if (iter == _events.end()) {
std::ostringstream msg;
@@ -89,7 +98,7 @@
throw std::runtime_error(msg.str());
} // if
- return iter->second;
+ PYLITH_METHOD_RETURN(iter->second);
} // eventId
// ----------------------------------------------------------------------
@@ -97,7 +106,9 @@
int
pylith::utils::EventLogger::registerStage(const char* name)
{ // registerStage
- assert(0 != _classId);
+ PYLITH_METHOD_BEGIN;
+
+ assert(_classId);
int id = 0;
PetscErrorCode err = PetscLogStageRegister(name, &id);
if (err) {
@@ -107,7 +118,7 @@
} // if
_stages[name] = id;
- return id;
+ PYLITH_METHOD_RETURN(id);
} // registerStage
// ----------------------------------------------------------------------
@@ -115,6 +126,8 @@
int
pylith::utils::EventLogger::stageId(const char* name)
{ // stageId
+ PYLITH_METHOD_BEGIN;
+
map_event_type::iterator iter = _stages.find(name);
if (iter == _stages.end()) {
registerStage(name);
@@ -122,7 +135,7 @@
assert(iter != _stages.end());
} // if
- return iter->second;
+ PYLITH_METHOD_RETURN(iter->second);
} // stagesId
Modified: short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc 2013-04-25 16:59:42 UTC (rev 21939)
+++ short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc 2013-04-25 17:14:11 UTC (rev 21940)
@@ -67,7 +67,7 @@
logger.className("my class");
CPPUNIT_ASSERT_EQUAL(0, logger._classId);
logger.initialize();
- CPPUNIT_ASSERT(0 != logger._classId);
+ CPPUNIT_ASSERT(logger._classId);
PYLITH_METHOD_END;
} // testInitialize
@@ -83,17 +83,15 @@
logger.className("my class");
logger.initialize();
- const char* events[] = { "event A", "event B", "event C" };
const int numEvents = 3;
+ const char* events[numEvents] = { "event A", "event B", "event C" };
int ids[numEvents];
for (int i=0; i < numEvents; ++i)
ids[i] = logger.registerEvent(events[i]);
int i = 0;
- for (EventLogger::map_event_type::iterator e_iter=logger._events.begin();
- e_iter != logger._events.end();
- ++e_iter, ++i) {
+ for (EventLogger::map_event_type::iterator e_iter=logger._events.begin(); e_iter != logger._events.end(); ++e_iter, ++i) {
CPPUNIT_ASSERT_EQUAL(std::string(events[i]), e_iter->first);
CPPUNIT_ASSERT_EQUAL(ids[i], e_iter->second);
} // for
@@ -112,21 +110,19 @@
logger.className("my class");
logger.initialize();
- const char* events[] = { "event A", "event B", "event C" };
const int numEvents = 3;
+ const char* events[numEvents] = { "event A", "event B", "event C" };
for (int i=0; i < numEvents; ++i)
logger.registerEvent(events[i]);
- const int order[] = { 1, 0, 2 };
+ const int order[numEvents] = { 1, 0, 2 };
int ids[numEvents];
for (int i=0; i < numEvents; ++i)
ids[order[i]] = logger.eventId(events[order[i]]);
int i = 0;
- for (EventLogger::map_event_type::iterator e_iter=logger._events.begin();
- e_iter != logger._events.end();
- ++e_iter, ++i)
+ for (EventLogger::map_event_type::iterator e_iter=logger._events.begin(); e_iter != logger._events.end(); ++e_iter, ++i)
CPPUNIT_ASSERT_EQUAL(e_iter->second, ids[i]);
PYLITH_METHOD_END;
@@ -143,8 +139,8 @@
logger.className("my class");
logger.initialize();
- const char* events[] = { "event A", "event B", "event C" };
const int numEvents = 3;
+ const char* events[numEvents] = { "event A", "event B", "event C" };
int ids[numEvents];
for (int i=0; i < numEvents; ++i)
@@ -179,17 +175,15 @@
logger.className("my class");
logger.initialize();
- const char* stages[] = { "stage A1", "stage B1", "stage C1" };
const int numStages = 3;
+ const char* stages[numStages] = { "stage A1", "stage B1", "stage C1" };
int ids[numStages];
for (int i=0; i < numStages; ++i)
ids[i] = logger.registerStage(stages[i]);
int i = 0;
- for (EventLogger::map_event_type::iterator s_iter=logger._stages.begin();
- s_iter != logger._stages.end();
- ++s_iter, ++i) {
+ for (EventLogger::map_event_type::iterator s_iter=logger._stages.begin(); s_iter != logger._stages.end(); ++s_iter, ++i) {
CPPUNIT_ASSERT_EQUAL(std::string(stages[i]), s_iter->first);
CPPUNIT_ASSERT_EQUAL(ids[i], s_iter->second);
} // for
@@ -208,22 +202,20 @@
logger.className("my class");
logger.initialize();
- const char* stages[] = { "stage A2", "stage B2", "stage C2" };
const int numStages = 3;
+ const char* stages[numStages] = { "stage A2", "stage B2", "stage C2" };
for (int i=0; i < numStages; ++i)
logger.registerStage(stages[i]);
- const int order[] = { 1, 0, 2 };
+ const int order[numStages] = { 1, 0, 2 };
int ids[numStages];
for (int i=0; i < numStages; ++i)
ids[order[i]] = logger.stageId(stages[order[i]]);
int i = 0;
- for (EventLogger::map_event_type::iterator s_iter=logger._stages.begin();
- s_iter != logger._stages.end();
- ++s_iter, ++i)
+ for (EventLogger::map_event_type::iterator s_iter=logger._stages.begin(); s_iter != logger._stages.end(); ++s_iter, ++i)
CPPUNIT_ASSERT_EQUAL(s_iter->second, ids[i]);
const int idNew = logger.stageId("stage D2");
@@ -243,8 +235,8 @@
logger.className("my class");
logger.initialize();
- const char* stages[] = { "stage A3", "stage B3", "stage C3" };
const int numStages = 3;
+ const char* stages[numStages] = { "stage A3", "stage B3", "stage C3" };
int ids[numStages];
for (int i=0; i < numStages; ++i)
More information about the CIG-COMMITS
mailing list