Changeset 8e24ef for src/Helpers/Chronos.cpp

Timestamp:

Apr 2, 2011, 12:20:10 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

bbd746

Parents:

93abe8

git-author:

Frederik Heber <heber@…> (03/15/11 09:53:34)

git-committer:

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

Message:

Chronos is so far fully working.

• Library version is now 7:0:0, API version is 1.1.0.
• using either time.h or sys/times.h if present to measure timing.

File:

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

src/Helpers/Chronos.cpp

@@ -22 +22 @@
 #include <iostream>
 
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#else
+# include <time.h>
+#endif
+
 #include "Chronos.hpp"
 
@@ -32 +38 @@
 {}
 
-int Chronos::getTime(const std::string _name) const
+double Chronos::getTime(const std::string _name) const
 {
   // only those functions have a time that have run already
-  if (IsTimeRunning.count(_name)) {
+  if (TimeRunning.count(_name)) {
     // return -1 if function is currently running
-    if (!IsTimeRunning.count(_name))
+    if (TimeRunning.count(_name) != 0.)
       return AccountedTime.at(_name);
     else
-      return -1;
+      return -1.;
   }
-  return 0;
+  return 0.;
 }
 
 void Chronos::resetTime(const std::string _name)
 {
-  if (IsTimeRunning.count(_name)) {
-    AccountedTime[_name] = 0;
+  if (TimeRunning.count(_name)) {
+    AccountedTime[_name] = 0.;
   }
 }
@@ -55 +61 @@
 {
   // start time keeping
-  IsTimeRunning[_name] = true;
+  TimeRunning[_name] = getCurrentTime();
+}
+
+double Chronos::getCurrentTime() const
+{
+#ifdef HAVE_SYS_TIMES_H
+  struct tms *buffer = new tms;
+  double currenttime;
+  if (times(buffer) != (clock_t)(-1))
+    currenttime = ((double)buffer->tms_utime/(double)CLOCKS_PER_SEC);
+  else
+    currenttime = 0.;
+  delete buffer;
+#else
+  const double currenttime = (clock()/(double)CLOCKS_PER_SEC);
+#endif
+  //std::cout << "Current time is " << currenttime << std::endl;
+  return currenttime;
 }
 
 void Chronos::endTiming(const std::string _name)
 {
-  // finish time keeping if present
-  ASSERT(IsTimeRunning.count(_name), "Chronos::endTiming() - no timer under "+_name+" running.");
-  IsTimeRunning[_name] = false;
+  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 RunTime = ((double)endtime - starttime);
+  TimekeepingMap::iterator iter = AccountedTime.find(_name);
+  if (iter != AccountedTime.end())
+    AccountedTime[_name] += RunTime;
+  else
+    AccountedTime[_name] = RunTime;
+
+  // and zero for next run
+  TimeRunning[_name] = 0.;
 }
 
-int Chronos::SumUpTotalTime() const
+double Chronos::SumUpTotalTime() const
 {
-  int sum = 0;
+  double sum = 0.;
   for (TimekeepingMap::const_iterator iter = AccountedTime.begin();
       iter != AccountedTime.end();
@@ -78 +113 @@
 size_t Chronos::SumUpTotalFunctions() const
 {
-  return IsTimeRunning.size();
+  return TimeRunning.size();
 }
 
 std::ostream& operator<<(std::ostream &ost, const Chronos &_time)
 {
-  int sum = _time.SumUpTotalTime();
-  ost << "Total time passed: " << sum << std::endl;
+  ost << "List of functions present:" << std::endl;
+  for (Chronos::TimekeepingMap::const_iterator iter = _time.AccountedTime.begin();
+      iter != _time.AccountedTime.end();
+      ++iter)
+    ost << "\t" << iter->first << "\t" << iter->second << "s" << std::endl;
+  ost << "Total time passed: " << _time.SumUpTotalTime() << std::endl;
   ost << "Total functions: " << _time.SumUpTotalFunctions() << std::endl;
-
   return ost;
 }
 
+// construct the remainder of the singleton
+CONSTRUCT_SINGLETON(Chronos)
 
-CONSTRUCT_SINGLETON(Chronos)
+// catch if someone wants to use Info objects in here
+#ifdef INFO_HPP_
+BOOST_PP_ASSERT_MSG(1,\
+  ERROR: This is a safety measure to generate a compiler warning\n \
+  if you really try to use info.hpp in __FILE__.)
+#endif
+