Changeset 3f06bb for src/CodePatterns

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/CodePatterns/Chronos.hpp (modified) (8 diffs)

src/CodePatterns/Chronos.hpp

@@ -16 +16 @@
 #include <iosfwd>
 #include <map>
+#include <string>
 
 #include "CodePatterns/Singleton.hpp"
@@ -29 +30 @@
   friend std::ostream& operator<<(std::ostream &ost, const Chronos &_time);
 public :
+  //!> typedef for the map storing times per token
+  typedef std::map<const std::string, double> TimekeepingMap;
 
   /** Returns current kept time of function \a _name.
@@ -35 +38 @@
    * @return current amount of time passed for this function, 0 if unknown, -1 if currently running
    */
-  double getTime(const std::string _name) const;
+  double getTime(const std::string &_name) const;
 
   /** Resets time counter for this function \a _name to zero.
@@ -41 +44 @@
    * @param _name name of function
    */
-  void resetTime(const std::string _name);
+  void resetTime(const std::string &_name);
 
   /** Starts Timing for this function \a _name.
@@ -47 +50 @@
    * @param _name name of function
    */
-  void startTiming(const std::string _name);
+  void startTiming(const std::string &_name);
 
   /** Finishes Timing for this function \a _name.
@@ -53 +56 @@
    * @param _name name of function
    */
-  void endTiming(const std::string _name);
+  void endTiming(const std::string &_name);
+
+  /** Returns const reference to time keeping map.
+   *
+   * \return const ref to timekeeping map
+   */
+  const TimekeepingMap& getTimekeepingMap() const;
 
   /** Sums up total time accounted for.
@@ -86 +95 @@
   double getCurrentTime() const;
 
+  //!> typedef for the map storing status of time keeping per token
+  typedef std::map<const std::string, double> TimerMap;
 
-  typedef std::map<const std::string, double> TimekeepingMap;
-  typedef std::map<const std::string, double> TimerStatusMap;
+  //!> typedef for the map storing number of recursive calls to this token
+  typedef std::map<const std::string, size_t> TimerRecursionMap;
 
+  //!> map storing times per token
   TimekeepingMap AccountedTime;
-  TimerStatusMap TimeRunning;
+  //!> map storing time keeping status per token
+  TimerMap StartingTime;
+  //!> map storing level of recursion per token
+  TimerRecursionMap RecursionMap;
+
+#ifdef HAVE_TIME_H
+  timespec basetime;
+#else
+#ifdef HAVE_SYS_TIME_H
+  struct timezone basetime;
+#else
+#ifdef HAVE_SYS_TIMES_H
+  struct tms *basetime;
+#endif
+#endif
+#endif
 };
 
@@ -102 +129 @@
 std::ostream& operator<<(std::ostream &ost, const Chronos &_time);
 
+// inline functions
+
+inline
+const Chronos::TimekeepingMap& Chronos::getTimekeepingMap() const
+{
+  return AccountedTime;
+}
+
 #endif /* CHRONOS_HPP_ */