X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10635c896affd8d1a754122439460d8499527c4a..839877aee607c198ffda1d836d72976831819825:/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 c42e398682..e56adc8e6f 100644
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,8 +1,7 @@
-/* $Id: xbt_log_layout_simple.c 6309 2009-05-26 15:29:22Z mquinson $ */
-
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -16,9 +15,10 @@
 #include <stdio.h>
 #include "portable.h"
 
-extern const char *xbt_log_priority_names[7];
+extern const char *xbt_log_priority_names[8];
+extern int xbt_log_no_loc;
 
-static double begin_of_time = -1;
+static double simple_begin_of_time = -1;
 
 static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
                                           xbt_log_event_t ev,
@@ -36,20 +36,17 @@ static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
   if (strlen(xbt_procname()))
     p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ",
                   gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
-  p +=
-    snprintf(p, 256 - (p - loc_buff), "%f] ",
-             gras_os_time() - begin_of_time);
-  if (ev->priority != xbt_log_priority_info)
-    p +=
-      snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
-               ev->lineNum);
-  p +=
-    snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
-             xbt_log_priority_names[ev->priority]);
+  p += snprintf(p, 256 - (p - loc_buff), "%f] ",
+                gras_os_time() - simple_begin_of_time);
+  if (ev->priority != xbt_log_priority_info && xbt_log_no_loc == 0)
+    p += snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
+                  ev->lineNum);
+  p += snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
+                xbt_log_priority_names[ev->priority]);
 
   xbt_strbuff_append(buff, loc_buff);
 
-  vasprintf(&p, fmt, ev->ap_copy);
+  p = bvprintf(fmt, ev->ap_copy);
   xbt_strbuff_append(buff, p);
   free(p);
 
@@ -60,6 +57,7 @@ static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
 }
 
 /* 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 */ \
   xbt_log_layout_simple_dynamic(l,ev,fmt,app); \
@@ -72,38 +70,34 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
                                        xbt_log_appender_t app)
 {
   char *p;
-
+  const char *procname = NULL;
   xbt_assert0(ev->priority >= 0,
               "Negative logging priority naturally forbidden");
   xbt_assert1(ev->priority < sizeof(xbt_log_priority_names),
               "Priority %d is greater than the biggest allowed value",
               ev->priority);
 
-  if (begin_of_time < 0)
-    begin_of_time = gras_os_time();
-
   p = ev->buffer;
   p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
   check_overflow;
 
   /* Display the proc info if available */
-  if (strlen(xbt_procname())) {
+  procname = xbt_procname();
+  if (strlen(procname)) {
     p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
-                  gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
+                  gras_os_myname(), procname, (*xbt_getpid) ());
     check_overflow;
   }
 
   /* Display the date */
-  p +=
-    snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
-             gras_os_time() - begin_of_time);
+  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
+                gras_os_time() - simple_begin_of_time);
   check_overflow;
 
   /* Display file position if not INFO */
-  if (ev->priority != xbt_log_priority_info)
-    p +=
-      snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
-               ev->fileName, ev->lineNum);
+  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);
 
   /* Display category name */
   p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ",
@@ -123,5 +117,9 @@ 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;
+
+  if (simple_begin_of_time < 0)
+    simple_begin_of_time = gras_os_time();
+
   return res;
 }