Changeset 2001

Timestamp:

15/12/2007 20:03:50 (13 months ago)

Author:

chris

Message:

Allow logging with microsecond timestamps.

Location:

box/trunk/lib/common

Files:

• Logging.cpp (modified) (4 diffs)
• Logging.h (modified) (2 diffs)

box/trunk/lib/common/Logging.cpp

@@ -21 +21 @@
 #include <iomanip>
 
+#include "BoxTime.h"
+
 bool Logging::sLogToSyslog  = false;
 bool Logging::sLogToConsole = false;
@@ -179 +181 @@
 
 bool Console::sShowTime = false;
-bool Console::sShowTag  = false;
+bool Console::sShowTimeMicros = false;
+bool Console::sShowTag = false;
 std::string Console::sTag;
 
@@ -193 +196 @@
 }
 
+void Console::SetShowTimeMicros(bool enabled)
+{
+        sShowTimeMicros = enabled;
+}
+
 bool Console::Log(Log::Level level, const std::string& rFile, 
         int line, std::string& rMessage)
@@ -212 +220 @@
         if (sShowTime)
         {
-                struct tm time_now, *tm_ptr = &time_now;
-                time_t time_t_now = time(NULL);
-
-                if (time_t_now == ((time_t)-1))
-                {
-                        msg += strerror(errno);
-                        msg += " ";
-                }
+                box_time_t time_now = GetCurrentBoxTime();
+                time_t seconds = BoxTimeToSeconds(time_now);
+                int micros = BoxTimeToMicroSeconds(time_now) % MICRO_SEC_IN_SEC;
+
+                struct tm tm_now, *tm_ptr = &tm_now;
+
                 #ifdef WIN32
-                        else if ((tm_ptr = localtime(&time_t_now)) != NULL)
+                        if ((tm_ptr = localtime(&seconds)) != NULL)
                 #else
-                        else if (localtime_r(&time_t_now, &time_now) != NULL)
+                        if (localtime_r(&seconds, &tm_now) != NULL)
                 #endif
                 {
                         std::ostringstream buf;
+
                         buf << std::setfill('0') <<
                                 std::setw(2) << tm_ptr->tm_hour << ":" << 
                                 std::setw(2) << tm_ptr->tm_min  << ":" <<
-                                std::setw(2) << tm_ptr->tm_sec  << " ";
+                                std::setw(2) << tm_ptr->tm_sec;
+
+                        if (sShowTimeMicros)
+                        {
+                                buf << "." << std::setw(6) << micros;
+                        }
+
+                        buf << " ";
                         msg += buf.str();
                 }

box/trunk/lib/common/Logging.h

@@ -119 +119 @@
         private:
         static bool sShowTime;
+        static bool sShowTimeMicros;
         static bool sShowTag;
         static std::string sTag;
@@ -130 +131 @@
         static void SetTag(const std::string& rTag);
         static void SetShowTime(bool enabled);
+        static void SetShowTimeMicros(bool enabled);
 };