We want host name here, not process name.

[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 e19302c..5d03f6f 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -11,8 +11,9 @@
 #include "xbt/sysdep.h"
 #include "xbt/strbuff.h"
 #include "xbt/log_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/strbuff.h"
 #include "xbt/log_private.h"

-#include "gras/virtu.h"         /* gras_os_myname (KILLME) */

 #include "xbt/synchro.h"        /* xbt_thread_self_name */
 #include "xbt/synchro.h"        /* xbt_thread_self_name */

+#include "simgrid/simix.h"      /* SIMIX_host_self_get_name */
+#include "surf/surf.h"

 #include <stdio.h>
 
 extern const char *xbt_log_priority_names[8];
 #include <stdio.h>
 
 extern const char *xbt_log_priority_names[8];


@@ -126,7 +127,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
         show_string(xbt_log_priority_names[ev->priority]);
         break;
       case 'h':                 /* host name; SimGrid extension */
         show_string(xbt_log_priority_names[ev->priority]);
         break;
       case 'h':                 /* host name; SimGrid extension */

-        show_string(gras_os_myname());
+        show_string(SIMIX_host_self_get_name());

         break;
       case 't':                 /* thread name; LOG4J compliant */
         show_string(xbt_thread_self_name());
         break;
       case 't':                 /* thread name; LOG4J compliant */
         show_string(xbt_thread_self_name());


@@ -184,10 +185,10 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l,
 #endif
         break;
       case 'd':                 /* date; LOG4J compliant */
 #endif
         break;
       case 'd':                 /* date; LOG4J compliant */

-        show_double(gras_os_time());
+        show_double(surf_get_clock());

         break;
       case 'r':                 /* application age; LOG4J compliant */
         break;
       case 'r':                 /* application age; LOG4J compliant */

-        show_double(gras_os_time() - format_begin_of_time);
+        show_double(surf_get_clock() - format_begin_of_time);

         break;
       case 'm': {               /* user-provided message; LOG4J compliant */
         int len, sz;
         break;
       case 'm': {               /* user-provided message; LOG4J compliant */
         int len, sz;


@@ -223,7 +224,7 @@ xbt_log_layout_t xbt_log_layout_format_new(char *arg)
   res->data = xbt_strdup((char *) arg);
 
   if (format_begin_of_time < 0)
   res->data = xbt_strdup((char *) arg);
 
   if (format_begin_of_time < 0)

-    format_begin_of_time = gras_os_time();
+    format_begin_of_time = surf_get_clock();

 
   return res;
 }
 
   return res;
 }