tizen 2.3 release

[adaptation/xorg/driver/xserver-xorg-module-xdbg.git] / lib / xdbg_log.c

diff --git a/lib/xdbg_log.c b/lib/xdbg_log.c
index f2b1c5e..c2bbd0d 100644 (file)
--- a/lib/xdbg_log.c
+++ b/lib/xdbg_log.c
@@ -33,6 +33,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <sys/time.h>
+#include <unistd.h>
+#include <time.h>
 #include <string.h>
 #include <stdarg.h>
 #include <dlog.h>
@@ -49,6 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define MAX_MODULE_NAME        4
 #define MAX_MODULE_CNT 256
 #define BUF_LEN         1024
+#define MAX_MONTH 12
 
 typedef struct
 {
@@ -60,6 +64,7 @@ typedef struct
 static ModuleInfo modules[MAX_MODULE_CNT];
 static int module_cnt = 0;
 static int default_level = XLOG_LEVEL_DEFAULT;
+static char *st_month[MAX_MONTH] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
 static Bool dlog_enable;
 
@@ -89,6 +94,8 @@ _LogModule (void * handle, int logoption, const char * file, int line, const cha
     char tmpBuf[BUF_LEN];
     int loglevel = logoption & XLOG_MASK_LOGLEVEL;
     const char *name;
+    struct timeval  tv;
+    struct tm      *tm=NULL;
 
     if (!h)
         return;
@@ -100,24 +107,32 @@ _LogModule (void * handle, int logoption, const char * file, int line, const cha
         snprintf(tmpBuf, BUF_LEN, "[%s]%s", (name)?name:"", f);
         kLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
     }
-
-    /* write to file */
-    if (loglevel >= XLOG_LEVEL_INFO)
+    else if (loglevel >= XLOG_LEVEL_INFO)
     {
-        if (logoption & XLOG_OPTION_SECURE)
-            snprintf(tmpBuf, BUF_LEN, "(%s) > [SECURE_LOG] [%s]%s", ostr[loglevel], (name)?name:"", f);
-        else
-            snprintf(tmpBuf, BUF_LEN, "(%s) [%s]%s", ostr[loglevel], (name)?name:"", f);
+        if( !dlog_enable )
+        {
+            /* get local time from tv */
+            gettimeofday(&tv, NULL);
+            tm = localtime(&tv.tv_sec);
+
+            /* write to file */
+            if (logoption & XLOG_OPTION_SECURE)
+                snprintf(tmpBuf, BUF_LEN, "[%s %d %02d:%02d:%02d:%03ld] (%s) > [SECURE_LOG] [%s]%s", st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000, ostr[loglevel], (name)?name:"", f);
+            else
+                snprintf(tmpBuf, BUF_LEN, "[%s %d %02d:%02d:%02d:%03ld] (%s) [%s]%s", st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000, ostr[loglevel], (name)?name:"", f);
 
-        if (!dlog_enable)
             LogVWrite (1, tmpBuf, args);
+        }
         else
         {
-            dLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
+            /* dlog already supports localtime stamp. So we just add clock time! */
+            /* write to file */
+            if (logoption & XLOG_OPTION_SECURE)
+                snprintf(tmpBuf, BUF_LEN, "[%10.3f] (%s) > [SECURE_LOG] [%s]%s", GetTimeInMillis()/1000.0, ostr[loglevel], (name)?name:"", f);
+            else
+                snprintf(tmpBuf, BUF_LEN, "[%10.3f] (%s) [%s]%s", GetTimeInMillis()/1000.0, ostr[loglevel], (name)?name:"", f);
 
-            /* write to Xorg.0.log too */
-            if (loglevel >= XLOG_LEVEL_WARNING)
-                LogVWrite (1, tmpBuf, args);
+            dLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
         }
     }
 
@@ -127,8 +142,16 @@ _LogModule (void * handle, int logoption, const char * file, int line, const cha
         char *buf = tmpBuf;
         int   remain = BUF_LEN;
         int   len = 0;
+        unsigned int tv_ms;
+
+        if( tm == NULL )
+        {
+            gettimeofday(&tv, NULL);
+            tm = localtime(&tv.tv_sec);
+        }
 
-        len = snprintf (buf, remain, "(%s) [%10.3f][%s]", ostr[loglevel], GetTimeInMillis()/1000.0, name?name:"");
+        tv_ms = tv.tv_usec/1000;
+        len = snprintf (buf, remain, "[%10.3f] [%s %d %02d:%02d:%02d:%03d] (%s) [%s]", GetTimeInMillis()/1000.0, st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv_ms, ostr[loglevel], name?name:"");
         buf += len;
         remain -= len;