Changeset 2003

Timestamp:

15/12/2007 20:04:56 (13 months ago)

Author:

chris

Message:

Don't log our own timestamp now that Logging can do it for us with
microsecond precision.

Files:

• box/trunk/lib/common/Timer.cpp (modified) (9 diffs)

box/trunk/lib/common/Timer.cpp

@@ -150 +150 @@
 }
 
-#define FORMAT_BOX_TIME(t) \
-        (BoxTimeToSeconds(t)) << "." << \
-        (BoxTimeToMicroSeconds(t) % MICRO_SEC_IN_SEC)
-
 #define FORMAT_MICROSECONDS(t) \
         (int)(t / 1000000) << "." << \
@@ -186 +182 @@
                 if (oldact.sa_handler != Timers::SignalHandler)
                 {
-                        printf("Signal handler was %p, expected %p\n", 
-                                oldact.sa_handler, Timers::SignalHandler);
+                        BOX_ERROR("Signal handler was " <<
+                                (void *)oldact.sa_handler << 
+                                ", expected " <<
+                                (void *)Timers::SignalHandler);
                         THROW_EXCEPTION(CommonException, Internal)
                 }
@@ -215 +213 @@
                         if (timeToExpiry <= 0)
                         {
-                                BOX_TRACE(FORMAT_MICROSECONDS(timeNow) <<
-                                        ": timer " << *i << " has expired, "
+                                BOX_TRACE("timer " << *i << " has expired, "
                                         "triggering it");
                                 rTimer.OnExpire();
@@ -225 +222 @@
                         else
                         {
-                                BOX_TRACE(FORMAT_MICROSECONDS(timeNow) <<
-                                        ": timer " << *i << " has not "
+                                BOX_TRACE("timer " << *i << " has not "
                                         "expired, triggering in " <<
                                         FORMAT_MICROSECONDS(timeToExpiry) <<
@@ -295 +291 @@
 {
         #ifndef NDEBUG
-        box_time_t timeNow = GetCurrentBoxTime();
         if (timeoutSecs == 0)
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised for " <<
+                BOX_TRACE("timer " << this << " initialised for " <<
                         timeoutSecs << " secs, will not fire");
         }
         else
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised for " <<
+                BOX_TRACE("timer " << this << " initialised for " <<
                         timeoutSecs << " secs, to fire at " <<
                         FORMAT_MICROSECONDS(mExpires));
@@ -324 +317 @@
 {
         #ifndef NDEBUG
-        box_time_t timeNow = GetCurrentBoxTime();
-        BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                ": timer " << this << " destroyed");
+        BOX_TRACE("timer " << this << " destroyed");
         #endif
 
@@ -337 +328 @@
 {
         #ifndef NDEBUG
-        box_time_t timeNow = GetCurrentBoxTime();
         if (mExpired)
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << ", already expired, will not fire");
         }
         else if (mExpires == 0)
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << ", no expiry, will not fire");
         }
         else
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << " to fire at " <<
                         (int)(mExpires / 1000000) << "." <<
@@ -369 +356 @@
 {
         #ifndef NDEBUG
-        box_time_t timeNow = GetCurrentBoxTime();
         if (rToCopy.mExpired)
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << ", already expired, will not fire");
         }
         else if (rToCopy.mExpires == 0)
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << ", no expiry, will not fire");
         }
         else
         {
-                BOX_TRACE(FORMAT_BOX_TIME(timeNow) <<
-                        ": timer " << this << " initialised from timer " <<
+                BOX_TRACE("timer " << this << " initialised from timer " <<
                         &rToCopy << " to fire at " <<
                         (int)(rToCopy.mExpires / 1000000) << "." <<
@@ -405 +388 @@
 {
         #ifndef NDEBUG
-        box_time_t timeNow = GetCurrentBoxTime();
-        BOX_TRACE(FORMAT_BOX_TIME(timeNow) << ": timer " << this << " fired");
+        BOX_TRACE("timer " << this << " fired");
         #endif