Change the code so that it compiles in supernovae mode

[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 77f6f09..4165fc7 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: xbt_log_layout_simple.c 6309 2009-05-26 15:29:22Z mquinson $ */
 
 /* layout_simple - a dumb log layout                                        */
 
@@ -16,9 +16,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,
@@ -31,20 +32,20 @@ static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
 
   /* Put every static information in a static buffer, and copy them in the dyn one */
   p = loc_buff;
-  p += snprintf(p, 256 - (p - ev->buffer), "[");
+  p += snprintf(p, 256 - (p - loc_buff), "[");
 
   if (strlen(xbt_procname()))
-    p += snprintf(p, 256 - (p - ev->buffer), "%s:%s:(%d) ",
+    p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ",
                   gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
   p +=
-    snprintf(p, 256 - (p - ev->buffer), "%f] ",
-             gras_os_time() - begin_of_time);
-  if (ev->priority != xbt_log_priority_info)
+    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 - ev->buffer), "%s:%d: ", ev->fileName,
+      snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
                ev->lineNum);
   p +=
-    snprintf(p, 256 - (p - ev->buffer), "[%s/%s] ", ev->cat->name,
+    snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
              xbt_log_priority_names[ev->priority]);
 
   xbt_strbuff_append(buff, loc_buff);
@@ -60,6 +61,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); \
@@ -79,8 +81,8 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
               "Priority %d is greater than the biggest allowed value",
               ev->priority);
 
-  if (begin_of_time < 0)
-    begin_of_time = gras_os_time();
+  if (simple_begin_of_time < 0)
+    simple_begin_of_time = gras_os_time();
 
   p = ev->buffer;
   p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
@@ -96,11 +98,11 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
   /* Display the date */
   p +=
     snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
-             gras_os_time() - begin_of_time);
+             gras_os_time() - simple_begin_of_time);
   check_overflow;
 
   /* Display file position if not INFO */
-  if (ev->priority != xbt_log_priority_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);