X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55c8f3c66f4f36410acf2f0130f72d577427485a..9a444de20a7545d1c3d10bd242f317febded25c4:/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 1b0e3c026b..ac603b446d 100644
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,73 +1,93 @@
-/* $Id$ */
-
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2007-2011. 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. */
 
 #include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/synchro.h" /* xbt_thread_name */
+#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 "gras/virtu.h"
 #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 simple_begin_of_time = -1;
+
+#define XBT_LOG_BUFF_SIZE (ev->buffer_size)
 
 /* 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 */ \
-     p=ev->buffer + XBT_LOG_BUFF_SIZE - strlen(" >> OUTPUT TRUNCATED <<\n"); \
-     p+=sprintf(p," >> OUTPUT TRUNCATED <<\n"); \
-  } 
-
-static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
-				       xbt_log_event_t ev, 
-				       const char *fmt) {
-  static double begin_of_time = -1;
-  char *p;  
-
-  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();
+  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)
+{
+  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),"[");
+  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
+  check_overflow;
 
   /* Display the proc info if available */
-  if(strlen(xbt_procname()))
-    p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", 
-		 gras_os_myname(), xbt_procname(),(*xbt_getpid)());
+  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;
+  }
 
   /* 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);
+  /* 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;
+  }
 
   /* Display category name */
-  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "[%s/%s] ", 
-	       ev->cat->name, xbt_log_priority_names[ev->priority] );
+  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ",
+                ev->cat->name, xbt_log_priority_names[ev->priority]);
+  check_overflow;
 
   /* Display user-provided message */
-  p += vsnprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), fmt, ev->ap);
+  p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), fmt, ev->ap);
   check_overflow;
-   
+
   /* End it */
-  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "\n");
+  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n");
   check_overflow;
+
+  return 1;
 }
 
-xbt_log_layout_t xbt_log_layout_simple_new(char *arg) {
-  xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t,1);
+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;
 }