Changeset ca940b for src

Timestamp:

Jul 14, 2014, 8:37:03 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

ef9dff6

Parents:

e93bfe

git-author:

Frederik Heber <heber@…> (06/18/14 08:14:25)

git-committer:

Frederik Heber <heber@…> (07/14/14 20:37:03)

Message:

FIX: Chronos is now working correctly, no more negative times.

• extracted difference calculator into static function, making it thus accessible to unit testing.
• kudos to Saskia Metzler for inspiring the test.

Location:

src

Files:

• CodePatterns/Chronos.hpp (modified) (1 diff)
• Helpers/Chronos.cpp (modified) (3 diffs)
• Helpers/unittests/ChronosUnitTest.cpp (modified) (1 diff)
• Helpers/unittests/ChronosUnitTest.hpp (modified) (2 diffs)

src/CodePatterns/Chronos.hpp

@@ -95 +95 @@
   double getCurrentTime() const;
 
+  typedef std::pair<size_t, size_t> sec_ncsec_t;
+
+  /** Returns the correct difference between split tuples (sec, nsec).
+   *
+   * \param _time1 first tuple
+   * \param _time2 second tuple
+   */
+  static
+  double calculateCorrectTimeDifference(
+                const sec_ncsec_t &_time1,
+      const sec_ncsec_t &_time2);
+
   //!> typedef for the map storing status of time keeping per token
   typedef std::map<const std::string, double> TimerMap;

src/Helpers/Chronos.cpp

@@ -102 +102 @@
 }
 
+double Chronos::calculateCorrectTimeDifference(
+    const sec_ncsec_t &_time1,
+    const sec_ncsec_t &_time2)
+{
+        double currenttime = 0.;
+  if (_time1.second < _time2.second)
+                currenttime = (_time1.first - _time2.first - 1)
+                        + (1e9 + _time1.second - _time2.second) * 1.e-9;
+  else
+                currenttime = (_time1.first - _time2.first)
+                        + (_time1.second - _time2.second) * 1.e-9;
+  return currenttime;
+}
+
 double Chronos::getCurrentTime() const
 {
@@ -108 +122 @@
   timespec time1;
   clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time1);
-  double currenttime;
-  if (time1.tv_nsec < basetime.tv_nsec)
-    currenttime = (time1.tv_sec - basetime.tv_sec - 1)
-        + (basetime.tv_nsec - time1.tv_nsec) * 1.e-9;
-  else
-    currenttime = (time1.tv_sec - basetime.tv_sec)
-        + (time1.tv_nsec - basetime.tv_nsec) * 1.e-9;
+  double currenttime = calculateCorrectTimeDifference(
+                  std::make_pair( time1.tv_sec, time1.tv_nsec),
+                  std::make_pair( basetime.tv_sec, basetime.tv_nsec)
+                  );
 #else
 #ifdef HAVE_SYS_TIME_H
@@ -121 +132 @@
   // gettimeofday gives microseconds accuracy
   gettimeofday(&time1, &timezone1);
-  double currenttime;
-  if (time1.tv_usec < basetime.tv_usec)
-    currenttime = (time1.tv_sec - basetime.tv_sec - 1)
-        + (basetime.tv_usec - time1.tv_usec) * 1.e-6;
-  else
-    currenttime = (time1.tv_sec - basetime.tv_sec)
-        + (time1.tv_usec - basetime.tv_usec) * 1.e-6;
+  double currenttime = calculateCorrectTimeDifference(
+      std::make_pair( time1.tv_sec, time1.tv_usec),
+                  std::make_pair( basetime.tv_sec, basetime.tv_usec)
+                  );
 #else
 #ifdef HAVE_SYS_TIMES_H
   // clock is only accurate up to milliseconds
   struct tms *buffer = new tms;
-  double currenttime;
   if (times(buffer) != (clock_t)(-1))
     currenttime =

src/Helpers/unittests/ChronosUnitTest.cpp

@@ -152 +152 @@
   std::cout << Chronos::getInstance() << std::endl;
 }
+
+/**
+ * UnitTest for Chronos::calculateCorrectTimeDifference()
+ */
+void ChronosTest::calculateCorrectTimeDifferenceTest()
+{
+  Chronos::sec_ncsec_t first;
+  Chronos::sec_ncsec_t second;
+        {
+                // 1.1 - 0.01
+                first.first = 1;
+                first.second = 1e8;
+                second.first = 0;
+                second.second = 1e7;
+                double difference = Chronos::calculateCorrectTimeDifference(first, second);
+    CPPUNIT_ASSERT( fabs(1.1-0.01 - difference) < std::numeric_limits<double>::epsilon()*1e2);
+//              CPPUNIT_ASSERT_EQUAL( 1.1-0.01, difference);
+        }
+        {
+                // 1.1 - 0.9
+                first.first = 1;
+                first.second = 1e8;
+                second.first = 0;
+                second.second = 9e8;
+                double difference = Chronos::calculateCorrectTimeDifference(first, second);
+                //    CPPUNIT_ASSERT_EQUAL( 1.1-0.9, difference);
+                CPPUNIT_ASSERT( fabs(1.1-0.9 - difference) < std::numeric_limits<double>::epsilon()*1e2);
+        }
+        {
+                // 1000.1 - 0.9
+                first.first = 1000;
+                first.second = 1e8;
+                second.first = 0;
+                second.second = 9e8;
+                double difference = Chronos::calculateCorrectTimeDifference(first, second);
+//              CPPUNIT_ASSERT_EQUAL( 1000.1-0.9, difference);
+    CPPUNIT_ASSERT( fabs(1000.1-0.9 - difference) < std::numeric_limits<double>::epsilon()*1e2);
+        }
+}

src/Helpers/unittests/ChronosUnitTest.hpp

@@ -21 +21 @@
     CPPUNIT_TEST ( InstanceTest );
     CPPUNIT_TEST ( dummyTest );
+    CPPUNIT_TEST ( calculateCorrectTimeDifferenceTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -29 +30 @@
     void InstanceTest();
     void dummyTest();
+    void calculateCorrectTimeDifferenceTest();
 };