Changeset 2842

Timestamp:

Jul 21, 2009 12:20:17 PM (15 years ago)

Author:

bennylp

Message:

Ticket #921: New logging option/flag to include caller thread ID

Location:

pjproject/trunk/pjlib

Files:

• include/pj/log.h (modified) (1 diff)
• src/pj/log.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/log.h

@@ -81 +81 @@
     PJ_LOG_HAS_SPACE      =  512, /**< Include two spaces before log [yes]    */
     PJ_LOG_HAS_COLOR      = 1024, /**< Colorize logs [yes on win32]           */
-    PJ_LOG_HAS_LEVEL_TEXT = 2048  /**< Include level text string [no]         */
+    PJ_LOG_HAS_LEVEL_TEXT = 2048, /**< Include level text string [no]         */
+    PJ_LOG_HAS_THREAD_ID  = 4096  /**< Include thread identification [no]     */
 };
 

pjproject/trunk/pjlib/src/pj/log.c

@@ -34 +34 @@
 static unsigned log_decor = PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC |
                             PJ_LOG_HAS_SENDER | PJ_LOG_HAS_NEWLINE |
-                            PJ_LOG_HAS_SPACE 
+                            PJ_LOG_HAS_SPACE
 #if defined(PJ_WIN32) && PJ_WIN32!=0
                             | PJ_LOG_HAS_COLOR
@@ -221 +221 @@
         }
     }
+    if (log_decor & PJ_LOG_HAS_THREAD_ID) {
+        enum { THREAD_WIDTH = 12 };
+        const char *thread_name = pj_thread_get_name(pj_thread_this());
+        int thread_len = strlen(thread_name);
+        *pre++ = ' ';
+        if (thread_len <= THREAD_WIDTH) {
+            while (thread_len < THREAD_WIDTH)
+                *pre++ = ' ', ++thread_len;
+            while (*thread_name)
+                *pre++ = *thread_name++;
+        } else {
+            int i;
+            for (i=0; i<THREAD_WIDTH; ++i)
+                *pre++ = *thread_name++;
+        }
+    }
 
     if (log_decor != 0 && log_decor != PJ_LOG_HAS_NEWLINE)