Changeset 3f06bb for src/Helpers/unittests

Timestamp:

Mar 2, 2013, 10:45:46 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

b9273a

Parents:

8f60da

git-author:

Frederik Heber <heber@…> (03/01/13 13:41:05)

git-committer:

Frederik Heber <heber@…> (03/02/13 22:45:46)

Message:

Enhanced Chronos for more accurate timekeeping.

• Chronos is now safe to use w.r.t. recursive function calls.
• Chronos now gets const ref of token name in each function.
• TESTFIX: dummyTest() now checks on recursive function.
• Chronos now offers its internal timekeeping via const ref to outside.
• Chronos also now has up to nanoseconds precision when either time.h or sys/time.h is present.
• librt required from clock_gettime().

Location:

src/Helpers/unittests

Files:

• ChronosUnitTest.cpp (modified) (4 diffs)
• Makefile.am (modified) (1 diff)
• stubs/ChronosStub.cpp (modified) (2 diffs)

src/Helpers/unittests/ChronosUnitTest.cpp

@@ -54 +54 @@
 }
 
+static size_t level = 0;
+
+void dummyRecursion()
+{
+  if (level > 2)
+    return;
+  ++level;
+  Chronos::getInstance().startTiming(__func__);
+  for (int i=0;i<10;++i) {
+    std::cout << "";
+    dummyRecursion();
+  }
+  Chronos::getInstance().endTiming(__func__);
+  --level;
+}
+
 
 void ChronosTest::setUp()
@@ -78 +94 @@
 void ChronosTest::dummyTest()
 {
-  double timings[4];
+  double timings[5];
   // first dummy
   dummy();
-  CPPUNIT_ASSERT( Chronos::getInstance().TimeRunning.find(std::string("dummy"))
-      != Chronos::getInstance().TimeRunning.end() );
+  CPPUNIT_ASSERT( Chronos::getInstance().StartingTime.find(std::string("dummy"))
+      == Chronos::getInstance().StartingTime.end() );
+  CPPUNIT_ASSERT( Chronos::getInstance().AccountedTime.find(std::string("dummy"))
+      != Chronos::getInstance().AccountedTime.end() );
   CPPUNIT_ASSERT_EQUAL( (size_t) 1, Chronos::getInstance().SumUpTotalFunctions() );
   timings[0] = Chronos::getInstance().AccountedTime[std::string("dummy")];
   std::cout << "Timing[0]: " << timings[0] << std::endl;
   CPPUNIT_ASSERT(timings[0] > 0.);
+
+  // second call goes to same entry
   dummy();
-  // second call goes to same entry
   CPPUNIT_ASSERT_EQUAL( (size_t) 1, Chronos::getInstance().SumUpTotalFunctions() );
   timings[1] = Chronos::getInstance().AccountedTime[std::string("dummy")] - timings[0];
@@ -94 +113 @@
   CPPUNIT_ASSERT(timings[1] > 0.);
 
-
   // second dummy
   dummy_two();
-  CPPUNIT_ASSERT( Chronos::getInstance().TimeRunning.find(std::string("dummy_two"))
-      != Chronos::getInstance().TimeRunning.end() );
+  CPPUNIT_ASSERT( Chronos::getInstance().AccountedTime.find(std::string("dummy_two"))
+      != Chronos::getInstance().AccountedTime.end() );
   CPPUNIT_ASSERT_EQUAL( (size_t) 2, Chronos::getInstance().SumUpTotalFunctions() );
   timings[2] = Chronos::getInstance().AccountedTime[std::string("dummy_two")];
   std::cout << "Timing[2]: " << timings[2] << std::endl;
   CPPUNIT_ASSERT(timings[2] > 0.);
+
+  // recursive dummy
+  dummyRecursion();
+  CPPUNIT_ASSERT( Chronos::getInstance().RecursionMap.find(std::string("dummyRecursion"))
+      != Chronos::getInstance().RecursionMap.end() );
+  CPPUNIT_ASSERT( Chronos::getInstance().AccountedTime.find(std::string("dummyRecursion"))
+      != Chronos::getInstance().AccountedTime.end() );
+  CPPUNIT_ASSERT_EQUAL( (size_t) 3, Chronos::getInstance().SumUpTotalFunctions() );
+  timings[3] = Chronos::getInstance().AccountedTime[std::string("dummyRecursion")];
+  std::cout << "Timing[3]: " << timings[3] << std::endl;
+  CPPUNIT_ASSERT(timings[3] > 0.);
 
   // "inline" dummy
@@ -111 +140 @@
     Chronos::getInstance().endTiming("dummy_three");
   }
-  CPPUNIT_ASSERT( Chronos::getInstance().TimeRunning.find(std::string("dummy_three"))
-      != Chronos::getInstance().TimeRunning.end() );
-  CPPUNIT_ASSERT_EQUAL( (size_t) 3, Chronos::getInstance().SumUpTotalFunctions() );
-  timings[3] = Chronos::getInstance().AccountedTime[std::string("dummy_three")];
-  std::cout << "Timing[3]: " << timings[3] << std::endl;
-  CPPUNIT_ASSERT(timings[3] > 0.);
+  CPPUNIT_ASSERT( Chronos::getInstance().AccountedTime.find(std::string("dummy_three"))
+      != Chronos::getInstance().AccountedTime.end() );
+  CPPUNIT_ASSERT_EQUAL( (size_t) 4, Chronos::getInstance().SumUpTotalFunctions() );
+  timings[4] = Chronos::getInstance().AccountedTime[std::string("dummy_three")];
+  std::cout << "Timing[4]: " << timings[4] << std::endl;
+  CPPUNIT_ASSERT(timings[4] > 0.);
 
   // check summing of times
-  CPPUNIT_ASSERT( fabs(timings[0] + timings[1] + timings[2] + timings[3]- Chronos::getInstance().SumUpTotalTime()) < numeric_limits<double>::epsilon());
+  CPPUNIT_ASSERT( fabs(timings[0] + timings[1] + timings[2] + timings[3] + timings[4]- Chronos::getInstance().SumUpTotalTime()) < numeric_limits<double>::epsilon());
 
   std::cout << Chronos::getInstance() << std::endl;

src/Helpers/unittests/Makefile.am

@@ -46 +46 @@
         $(top_srcdir)/src/CodePatterns/Info.hpp
 ChronosUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libCodePatterns-Helpers-debug.la \
+        $(LIBRT)
 
 InfoUnitTest_SOURCES = UnitTestMain.cpp \

src/Helpers/unittests/stubs/ChronosStub.cpp

@@ -28 +28 @@
 {}
 
-double Chronos::getTime(const std::string _name) const
+double Chronos::getTime(const std::string &_name) const
 {
   return 0.;
 }
 
-void Chronos::resetTime(const std::string _name)
+void Chronos::resetTime(const std::string &_name)
 {}
 
-void Chronos::startTiming(const std::string _name)
+void Chronos::startTiming(const std::string &_name)
 {}
 
@@ -44 +44 @@
 }
 
-void Chronos::endTiming(const std::string _name)
+void Chronos::endTiming(const std::string &_name)
 {}