Changeset 1857

Timestamp:

23/09/2007 10:19:04 (16 months ago)

Author:

chris

Message:

Make detailed timer debugging work on Windows as well.

Add a couple of macros to clean up the code.

Files:

• box/chris/general/lib/common/Timer.cpp (modified) (13 diffs)

box/chris/general/lib/common/Timer.cpp

@@ -130 +130 @@
 }
 
+#define FORMAT_BOX_TIME(t) \
+        (BoxTimeToSeconds(t)) << "." << \
+        (BoxTimeToMicroSeconds(t) % MICRO_SEC_IN_SEC)
+
+#define FORMAT_MICROSECONDS(t) \
+        (int)(t / 1000000) << "." << \
+        (int)(t % 1000000)
+
 // --------------------------------------------------------------------------
 //
@@ -176 +184 @@
                         if (timeToExpiry <= 0)
                         {
-                                BOX_TRACE((int)(timeNow / 1000000) << "." <<
-                                        (int)(timeNow % 1000000) <<
+                                BOX_TRACE(FORMAT_MICROSECONDS(timeNow) <<
                                         ": timer " << *i << " has expired, "
                                         "triggering it");
@@ -187 +194 @@
                         else
                         {
-                                BOX_TRACE((int)(timeNow / 1000000) << "." <<
-                                        (int)(timeNow % 1000000) <<
+                                BOX_TRACE(FORMAT_MICROSECONDS(timeNow) <<
                                         ": timer " << *i << " has not "
                                         "expired, triggering in " <<
-                                        (int)(timeToExpiry / 1000000) << "." <<
-                                        (int)(timeToExpiry % 1000000) <<
+                                        FORMAT_MICROSECONDS(timeToExpiry) <<
                                         " seconds");
                         }
@@ -258 +263 @@
   mExpired(false)
 {
-        #if !defined NDEBUG && !defined WIN32
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
+        #ifndef NDEBUG
+        box_time_t timeNow = GetCurrentBoxTime();
         if (timeoutSecs == 0)
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised for " <<
                         timeoutSecs << " secs, will not fire");
@@ -269 +273 @@
         else
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised for " <<
                         timeoutSecs << " secs, to fire at " <<
-                        (int)(mExpires / 1000000) << "." <<
-                        (int)(mExpires % 1000000));
+                        FORMAT_MICROSECONDS(mExpires));
         }
         #endif
@@ -289 +292 @@
 Timer::~Timer()
 {
-        #if !defined NDEBUG && !defined WIN32
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
-        BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+        #ifndef NDEBUG
+        box_time_t timeNow = GetCurrentBoxTime();
+        BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                 ": timer " << this << " destroyed");
         #endif
@@ -303 +305 @@
   mExpired(rToCopy.mExpired)
 {
-        #if !defined NDEBUG && !defined WIN32
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
+        #ifndef NDEBUG
+        box_time_t timeNow = GetCurrentBoxTime();
         if (mExpired)
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << ", already expired, will not fire");
@@ -314 +315 @@
         else if (mExpires == 0)
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << ", no expiry, will not fire");
@@ -320 +321 @@
         else
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << " to fire at " <<
@@ -336 +337 @@
 Timer& Timer::operator=(const Timer& rToCopy)
 {
-        #if !defined NDEBUG && !defined WIN32
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
+        #ifndef NDEBUG
+        box_time_t timeNow = GetCurrentBoxTime();
         if (rToCopy.mExpired)
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << ", already expired, will not fire");
@@ -347 +347 @@
         else if (rToCopy.mExpires == 0)
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << ", no expiry, will not fire");
@@ -353 +353 @@
         else
         {
-                BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
+                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
                         ": timer " << this << " initialised from timer " <<
                         &rToCopy << " to fire at " <<
@@ -373 +373 @@
 void Timer::OnExpire()
 {
-        #if !defined NDEBUG && !defined WIN32
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
-        BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
-                ": timer " << this << " fired");
+        #ifndef NDEBUG
+        box_time_t timeNow = GetCurrentBoxTime();
+        BOX_TRACE(FORMAT_BOX_TIME(timeNow) << ": timer " << this << " fired");
         #endif