Changeset 3f06bb for src/Helpers/Chronos.cpp

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().

File:

• src/Helpers/Chronos.cpp (modified) (5 diffs)

src/Helpers/Chronos.cpp

@@ -39 +39 @@
 
 Chronos::Chronos()
-{}
+{
+  // get time and store it internally as base time
+#ifdef HAVE_TIME_H
+  clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &basetime);
+#else
+#ifdef HAVE_SYS_TIME_H
+  struct timezone timezone1;
+  gettimeofday(&basetime, &timezone1);
+#else
+#ifdef HAVE_SYS_TIMES_H
+  struct tms *basetime = new tms;
+  times(basetime);
+#endif
+#endif
+#endif
+}
 
 Chronos::~Chronos()
-{}
-
-double Chronos::getTime(const std::string _name) const
+{
+#ifndef HAVE_TIME_H
+#ifndef HAVE_SYS_TIME_H
+#ifdef HAVE_SYS_TIMES_H
+  delete basetime;
+#endif
+#endif
+#endif
+}
+
+double Chronos::getTime(const std::string &_name) const
 {
   // only those functions have a time that have run already
-  if (TimeRunning.count(_name)) {
+  if (AccountedTime.count(_name) != 0) {
     // return -1 if function is currently running
-    if (TimeRunning.count(_name) != 0.)
+    if (StartingTime.count(_name) == 0.)
       return AccountedTime.at(_name);
     else
@@ -57 +80 @@
 }
 
-void Chronos::resetTime(const std::string _name)
-{
-  if (TimeRunning.count(_name)) {
+void Chronos::resetTime(const std::string &_name)
+{
+  // set accounted time to zero
+  if (AccountedTime.count(_name) != 0) {
     AccountedTime[_name] = 0.;
   }
-}
-
-void Chronos::startTiming(const std::string _name)
+  // and end if it's currently running
+  StartingTime.erase(_name);
+  RecursionMap.erase(_name);
+}
+
+void Chronos::startTiming(const std::string &_name)
 {
   // start time keeping
-  TimeRunning[_name] = getCurrentTime();
+  if ((RecursionMap.count(_name) == 0) || (RecursionMap[_name] == 0)) {
+    StartingTime[_name] = getCurrentTime();
+    RecursionMap[_name] = 1;
+  } else {
+    ++RecursionMap[_name];
+  }
 }
 
 double Chronos::getCurrentTime() const
 {
-#ifdef HAVE_SYS_TIMES_H
+#ifdef HAVE_TIME_H
+  // clock_gettime gives nanoseconds accuracy
+  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;
+#else
+#ifdef HAVE_SYS_TIME_H
+  struct timezone timezone1;
+  timeval time1;
+  // 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;
+#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 = ((double)buffer->tms_utime/(double)sysconf(_SC_CLK_TCK));
+    currenttime =
+        (double)(buffer->tms_utime - basetime->tms_utime)/(double)sysconf(_SC_CLK_TCK);
   else
     currenttime = 0.;
   delete buffer;
 #else
-  const double currenttime = (clock()/(double)CLOCKS_PER_SEC);
+  // no time keeping possible
+  const double currenttime = 0.;
+#endif
+#endif
 #endif
   //std::cout << "Current time is " << currenttime << std::endl;
@@ -87 +149 @@
 }
 
-void Chronos::endTiming(const std::string _name)
-{
+void Chronos::endTiming(const std::string &_name)
+{
+  // check whether we are the topmost function, return if not
+  if (--RecursionMap[_name] != 0)
+    return;
+
+  // if present
+  ASSERT(StartingTime.count(_name), "Chronos::endTiming() - no timer under "
+      +_name+" running.");
+  ASSERT(RecursionMap.count(_name), "Chronos::endTiming() - negative recursion level for "
+      +_name+".");
+
+  // finish time keeping
   const double endtime = getCurrentTime();
-  const double starttime = TimeRunning[_name];
-
-  // if present
-  ASSERT(TimeRunning.count(_name), "Chronos::endTiming() - no timer under "+_name+" running.");
-  // finish time keeping
+  const double starttime = StartingTime[_name];
   const double RunTime = ((double)endtime - starttime);
-  TimekeepingMap::iterator iter = AccountedTime.find(_name);
-  if (iter != AccountedTime.end())
+  if (AccountedTime.count(_name) != 0)
     AccountedTime[_name] += RunTime;
   else
@@ -103 +171 @@
 
   // and zero for next run
-  TimeRunning[_name] = 0.;
+  StartingTime.erase(_name);
 }
 
@@ -119 +187 @@
 size_t Chronos::SumUpTotalFunctions() const
 {
-  return TimeRunning.size();
+  return AccountedTime.size();
 }