Changeset 93abe8

Timestamp:

Apr 2, 2011, 12:11:44 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

8e24ef

Parents:

6b898c

git-author:

Frederik Heber <heber@…> (03/14/11 17:54:03)

git-committer:

Frederik Heber <heber@…> (04/02/11 00:11:44)

Message:

Added static and private object counter Info::NumberInfos.

Location:

src

Files:

• Helpers/Chronos.cpp (added)
• Helpers/Chronos.hpp (added)
• Helpers/Info.cpp (modified) (4 diffs)
• Helpers/Info.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• unittests/ChronosUnitTest.cpp (added)
• unittests/ChronosUnitTest.hpp (added)
• unittests/InfoUnitTest.cpp (modified) (1 diff)
• unittests/Makefile.am (modified) (4 diffs)

src/Helpers/Info.cpp

@@ -20 +20 @@
 #include "MemDebug.hpp"
 
+#include "Chronos.hpp"
 #include "Info.hpp"
 #include "Log.hpp"
@@ -25 +26 @@
 
 int Info::verbosity = 0;
+Chronos * Info::timekeeper = NULL;
+bool Info::ChronosBlocker = false;
+size_t Info::NumberInfos = 0;
 
 /**
@@ -36 +40 @@
   verbosity++;
   DoLog(0) && (Log() << Verbose(0) << "Begin of " << FunctionName << endl);
-};
+
+  // one more info object
+  ++NumberInfos;
+
+  // have pointer ready
+  if (timekeeper == NULL) {
+    timekeeper = Chronos::getPointer();
+  }
+
+  // start time keeping
+  timekeeper->startTiming(FunctionName);
+}
 
 /**
  * Destructor. Better use purgeInstance().
  */
-Info::~Info() {
+Info::~Info()
+{
+  // end time keeping
+  timekeeper->endTiming(FunctionName);
+
+  // verbosity stuff
   DoLog(0) && (Log() << Verbose(0) << "End of " << FunctionName << endl);
   verbosity--;
+
+  // one info object less
+  --NumberInfos;
+
+  // we are last one?
+  if (!NumberInfos) {
+    timekeeper = NULL;
+  }
 }
 
@@ -51 +79 @@
  * \param verbosityLevel verbosity
  */
-void Info::setVerbosity(int verbosityLevel) {
+void Info::setVerbosity(int verbosityLevel)
+{
   verbosity = verbosityLevel;
 }

src/Helpers/Info.hpp

@@ -14 +14 @@
 #endif
 
+#include <string>
+
+class ChronosTest;
+
 /*********************************************** includes ***********************************/
 
@@ -21 +25 @@
 
 class Info {
+  //!> unit tests needs access to some internals
+  friend class ChronosTest;
 public :
   static int verbosity;
-  const char *FunctionName;
+  const std::string FunctionName;
 
   Info(const char *msg);
@@ -29 +35 @@
   static void setVerbosity(int verbosityLevel);
 
+private:
+  static class Chronos * timekeeper;
+  static bool ChronosBlocker;
+  static size_t NumberInfos;
 };
 

src/Makefile.am

@@ -61 +61 @@
         Patterns/Observer.cpp \
         Helpers/Assert.cpp \
+        Helpers/Chronos.cpp \
         Helpers/errorlogger.cpp \
         Helpers/Info.cpp \
@@ -71 +72 @@
 HELPERSHEADER =  \
         Helpers/Assert.hpp \
+        Helpers/Chronos.hpp \
         Helpers/enumeration.hpp \
         Helpers/errorlogger.hpp \

src/unittests/InfoUnitTest.cpp

@@ -59 +59 @@
   class Info test(msg);
 
-  CPPUNIT_ASSERT_EQUAL( msg , test.FunctionName );
+  CPPUNIT_ASSERT_EQUAL( std::string(msg) , test.FunctionName );
   CPPUNIT_ASSERT_EQUAL( 1, test.verbosity );
 };

src/unittests/Makefile.am

@@ -13 +13 @@
 TESTS = \
         AssertUnitTest \
+        ChronosUnitTest \
   InfoUnitTest \
   IteratorAdaptorsUnitTest \
@@ -47 +48 @@
   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.cpp \
   AssertUnitTest.cpp \
+        ChronosUnitTest.cpp \
   InfoUnitTest.cpp \
   LogUnitTest.cpp \
@@ -80 +82 @@
   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.hpp \
   AssertUnitTest.hpp \
+        ChronosUnitTest.hpp \
   InfoUnitTest.hpp \
   LogUnitTest.hpp \
@@ -89 +92 @@
         AssertUnitTest.hpp 
 AssertUnitTest_LDADD = ${TESTLIBS}
+
+ChronosUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ChronosUnitTest.cpp \
+        ChronosUnitTest.hpp
+ChronosUnitTest_LDADD = ${TESTLIBS}
 
 InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \