X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a444de20a7545d1c3d10bd242f317febded25c4..4a69abcc786d029bd2962537f767d12a0f808d11:/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 ac603b446d..c709fca855 100644
--- 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,75 +8,67 @@
 
 #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;
 
 static double simple_begin_of_time = -1;
 
-#define XBT_LOG_BUFF_SIZE (ev->buffer_size)
+#define check_overflow(len)                                             \
+  if ((rem_size -= (len)) > 0) {                                        \
+    p += (len);                                                         \
+  } else                                                                \
+    return 0
 
-/* only used after the format using: we suppose that the buffer is big enough to display our data */
-#undef check_overflow
-#define check_overflow \
-  if (p - ev->buffer >= XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \
-    return 0;                                                      \
-  } else ((void)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;
-  const char *procname = NULL;
-  xbt_assert(ev->priority >= 0,
-              "Negative logging priority naturally forbidden");
-  xbt_assert(ev->priority < sizeof(xbt_log_priority_names),
-              "Priority %d is greater than the biggest allowed value",
-              ev->priority);
-
-  p = ev->buffer;
-  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
-  check_overflow;
+  char *p = ev->buffer;
+  int rem_size = ev->buffer_size;
+  const char *procname;
+  int len;
+
+  *p = '[';
+  check_overflow(1);
 
   /* Display the proc info if available */
   procname = xbt_procname();
-  if (strlen(procname)) {
-    p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
-                  gras_os_myname(), procname, (*xbt_getpid) ());
-    check_overflow;
+  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 */
-  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
-                gras_os_time() - simple_begin_of_time);
-  check_overflow;
+  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) {
-    p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
-                  ev->fileName, ev->lineNum);
-    check_overflow;
+    len = snprintf(p, rem_size, "%s:%d: ", ev->fileName, ev->lineNum);
+    check_overflow(len);
   }
 
   /* Display category name */
-  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ",
-                ev->cat->name, xbt_log_priority_names[ev->priority]);
-  check_overflow;
+  len = snprintf(p, rem_size, "[%s/%s] ", ev->cat->name, xbt_log_priority_names[ev->priority]);
+  check_overflow(len);
 
   /* Display user-provided message */
-  p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), fmt, ev->ap);
-  check_overflow;
+  len = vsnprintf(p, rem_size, fmt, ev->ap);
+  check_overflow(len);
 
   /* End it */
-  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n");
-  check_overflow;
+  *p = '\n';
+  check_overflow(1);
+  *p = '\0';
 
   return 1;
 }
@@ -84,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;
 }