I think I just killed a simcall

[simgrid.git] / 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 7a81a9c..c709fca 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,6 +1,6 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2011. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,12 +8,12 @@
 
 #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 "src/xbt/log_private.h"
 
-#include "gras/virtu.h"
+#include "simgrid/simix.h"      /* SIMIX_host_self_get_name */
+#include "surf/surf.h"
 #include <stdio.h>
-#include "portable.h"
+#include "src/internal_config.h"
 
 extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;
@@ -26,9 +26,7 @@ static double simple_begin_of_time = -1;
   } else                                                                \
     return 0
 
-static int xbt_log_layout_simple_doit(xbt_log_layout_t l,
-                                      xbt_log_event_t ev,
-                                      const char *fmt)
+static int xbt_log_layout_simple_doit(xbt_log_layout_t l, xbt_log_event_t ev, const char *fmt)
 {
   char *p = ev->buffer;
   int rem_size = ev->buffer_size;
@@ -40,27 +38,27 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t l,
 
   /* Display the proc info if available */
   procname = xbt_procname();
-  if (procname && *procname) {
-    len = snprintf(p, rem_size, "%s:%s:(%d) ",
-                   gras_os_myname(), procname, xbt_getpid());
+  if (procname && strcmp(procname,"maestro")) {
+    len = snprintf(p, rem_size, "%s:%s:(%d) ", 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);
+  len = snprintf(p, rem_size, "%f] ", surf_get_clock() - simple_begin_of_time);
   check_overflow(len);
 
   /* Display file position if not INFO */
   if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc) {
-    len = snprintf(p, rem_size, "%s:%d: ",
-                   ev->fileName, ev->lineNum);
+    len = snprintf(p, rem_size, "%s:%d: ", ev->fileName, ev->lineNum);
     check_overflow(len);
   }
 
   /* Display category name */
-  len = snprintf(p, rem_size, "[%s/%s] ",
-                 ev->cat->name, xbt_log_priority_names[ev->priority]);
+  len = snprintf(p, rem_size, "[%s/%s] ", ev->cat->name, xbt_log_priority_names[ev->priority]);
   check_overflow(len);
 
   /* Display user-provided message */
@@ -78,10 +76,10 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t l,
 xbt_log_layout_t xbt_log_layout_simple_new(char *arg)
 {
   xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
-  res->do_layout = xbt_log_layout_simple_doit;
+  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;
 }