X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..3676269c65359df0174fd13b6c11687992437df8:/src/xbt/xbt_log_layout_simple.c

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 30108d4697..be6b390676 100644
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -9,9 +9,9 @@
 #include "xbt/sysdep.h"
 #include "xbt/strbuff.h"        /* For dynamic version when the static one fails */
 #include "xbt/log_private.h"
-#include "xbt/synchro.h"        /* xbt_thread_name */
 
-#include "gras/virtu.h"
+#include "simgrid/simix.h"      /* SIMIX_host_self_get_name */
+#include "surf/surf.h"
 #include <stdio.h>
 #include "portable.h"
 
@@ -40,15 +40,20 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t l,
 
   /* Display the proc info if available */
   procname = xbt_procname();
-  if (*procname) {
+  if (procname && *procname) {
     len = snprintf(p, rem_size, "%s:%s:(%d) ",
-                   gras_os_myname(), procname, xbt_getpid());
+                   SIMIX_host_self_get_name(), procname, xbt_getpid());
     check_overflow(len);
   }
+  else if (!procname)  {
+  len = snprintf(p, rem_size, "%s::(%d) ",
+                 SIMIX_host_self_get_name(), xbt_getpid());
+  check_overflow(len);
+  }
 
   /* Display the date */
   len = snprintf(p, rem_size, "%f] ",
-                 gras_os_time() - simple_begin_of_time);
+                 surf_get_clock() - simple_begin_of_time);
   check_overflow(len);
 
   /* Display file position if not INFO */
@@ -81,7 +86,7 @@ xbt_log_layout_t xbt_log_layout_simple_new(char *arg)
   res->do_layout = xbt_log_layout_simple_doit;
 
   if (simple_begin_of_time < 0)
-    simple_begin_of_time = gras_os_time();
+    simple_begin_of_time = surf_get_clock();
 
   return res;
 }