Use proper thread name, and some sanitizing of how we get the current time (using...

[simgrid.git] / src / xbt / xbt_log_layout_format.c

diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 190d5dc..2cf2a0f 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -10,8 +10,9 @@
 #include "portable.h" /* execinfo when available */
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "gras/virtu.h"
-#include "xbt/synchro.h" /* xbt_thread_self */
+#include "gras/virtu.h" /* gras_os_myname (KILLME) */
+#include "xbt/synchro.h" /* xbt_thread_self_name */
+#include "xbt/xbt_os_time.h" /* xbt_os_time */
 #include <stdio.h>
 
 extern const char *xbt_log_priority_names[7];
@@ -26,7 +27,7 @@ static char *xbt_log_layout_format_doit(xbt_log_layout_t l,
   int precision=-1;
 
   if (begin_of_time<0) 
-    begin_of_time=gras_os_time();
+    begin_of_time=xbt_os_time();
 
   p = res;
   q = l->data;
@@ -81,8 +82,12 @@ static char *xbt_log_layout_format_doit(xbt_log_layout_t l,
        }        
        break;
       case 't': /* thread name; LOG4J compliant */
-       p += sprintf(p, "%p", xbt_thread_self());
-       precision = -1;
+       if (precision == -1)
+          p += sprintf(p, "%s", xbt_thread_self_name());
+        else {       
+          p += sprintf(p, "%.*s", precision, xbt_thread_self_name());
+          precision = -1;
+       }        
        break;
       case 'P': /* process name; SimGrid extension */
        if (precision == -1)
@@ -171,17 +176,17 @@ static char *xbt_log_layout_format_doit(xbt_log_layout_t l,
 
       case 'd': /* date; LOG4J compliant */
        if (precision == -1)
-          p += sprintf(p,"%f", gras_os_time());
+          p += sprintf(p,"%f", xbt_os_time());
         else {       
-          p += sprintf(p,"%.*f", precision, gras_os_time());
+          p += sprintf(p,"%.*f", precision, xbt_os_time());
           precision = -1;
        }        
        break;
       case 'r': /* application age; LOG4J compliant */
        if (precision == -1)
-          p += sprintf(p,"%f", gras_os_time()-begin_of_time);
+          p += sprintf(p,"%f", xbt_os_time()-begin_of_time);
         else {       
-          p += sprintf(p,"%.*f", precision, gras_os_time()-begin_of_time);
+          p += sprintf(p,"%.*f", precision, xbt_os_time()-begin_of_time);
           precision = -1;
        }        
        break;