b_1666 new log format "020000:001000:0:1066038144.520164:2980:916:2813:(ldlm_resource...

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 77e742f..e411c0a 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -799,35 +799,33 @@ portals_debug_msg(int subsys, int mask, char *file, const char *fn,
         do_gettimeofday(&tv);
 
         prefix_nob = snprintf(debug_buf + debug_off, max_nob,
-                              "%06x:%06x:%d:%lu.%06lu :",
+                              "%06x:%06x:%d:%lu.%06lu:%lu:%d:",
                               subsys, mask, smp_processor_id(),
-                              tv.tv_sec, tv.tv_usec);
+                              tv.tv_sec, tv.tv_usec, stack, current->pid);
         max_nob -= prefix_nob;
-        if(*(format + strlen(format) - 1) == '\n')
-                *(format + strlen(format) - 1) = ':';
-           
-        va_start(ap, format);
-        msg_nob = vsnprintf(debug_buf + debug_off + prefix_nob ,
-                            max_nob, format, ap);
-        max_nob -= msg_nob;
-        va_end(ap);
+        if(*(format + strlen(format) - 1) != '\n')
+                *(format + strlen(format)) = '\n';
 
 #if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d | %d+%lu)\n",
-                           file, line, fn, current->pid,
-                           current->thread.extern_pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           "%d:(%s:%d:%s()) ",
+                           current->thread.extern_pid, file, line, fn);
 #elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d | %d+%lu)\n",
-                           file, line, fn, current->pid,
-                           current->thread.mode.tt.extern_pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           "%d:(%s:%d:%s()) ",
+                           current->thread.mode.tt.extern_pid, file, line, fn);
 #else
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d+%lu)\n",
-                           file, line, fn, current->pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           ":(%s:%d:%s()) ",
+                           file, line, fn);
 #endif
 
+        va_start(ap, format);
+        msg_nob += vsnprintf(debug_buf + debug_off + prefix_nob + msg_nob,
+                             max_nob, format, ap);
+        max_nob -= msg_nob;
+        va_end(ap);
+
         /* Print to console, while msg is contiguous in debug_buf */
         /* NB safely terminated see above */
         if ((mask & D_EMERG) != 0)

diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c
index 77e742f..e411c0a 100644 (file)
--- a/lustre/portals/libcfs/debug.c
+++ b/lustre/portals/libcfs/debug.c
@@ -799,35 +799,33 @@ portals_debug_msg(int subsys, int mask, char *file, const char *fn,
         do_gettimeofday(&tv);
 
         prefix_nob = snprintf(debug_buf + debug_off, max_nob,
-                              "%06x:%06x:%d:%lu.%06lu :",
+                              "%06x:%06x:%d:%lu.%06lu:%lu:%d:",
                               subsys, mask, smp_processor_id(),
-                              tv.tv_sec, tv.tv_usec);
+                              tv.tv_sec, tv.tv_usec, stack, current->pid);
         max_nob -= prefix_nob;
-        if(*(format + strlen(format) - 1) == '\n')
-                *(format + strlen(format) - 1) = ':';
-           
-        va_start(ap, format);
-        msg_nob = vsnprintf(debug_buf + debug_off + prefix_nob ,
-                            max_nob, format, ap);
-        max_nob -= msg_nob;
-        va_end(ap);
+        if(*(format + strlen(format) - 1) != '\n')
+                *(format + strlen(format)) = '\n';
 
 #if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d | %d+%lu)\n",
-                           file, line, fn, current->pid,
-                           current->thread.extern_pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           "%d:(%s:%d:%s()) ",
+                           current->thread.extern_pid, file, line, fn);
 #elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d | %d+%lu)\n",
-                           file, line, fn, current->pid,
-                           current->thread.mode.tt.extern_pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           "%d:(%s:%d:%s()) ",
+                           current->thread.mode.tt.extern_pid, file, line, fn);
 #else
-        msg_nob += snprintf(debug_buf + debug_off + prefix_nob + msg_nob, max_nob,
-                           "(%s:%d:%s() %d+%lu)\n",
-                           file, line, fn, current->pid, stack);
+        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
+                           ":(%s:%d:%s()) ",
+                           file, line, fn);
 #endif
 
+        va_start(ap, format);
+        msg_nob += vsnprintf(debug_buf + debug_off + prefix_nob + msg_nob,
+                             max_nob, format, ap);
+        max_nob -= msg_nob;
+        va_end(ap);
+
         /* Print to console, while msg is contiguous in debug_buf */
         /* NB safely terminated see above */
         if ((mask & D_EMERG) != 0)