X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/652f57a8ad22d3b0194df708c7049be37d7d3074..f60438a0ee6d4be0f37c9d66f2c1cf3d4eb8812d:/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 9185cb2e5d..84571d6a86 100644
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,64 +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 "gras/virtu.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 "simgrid/simix.h"      /* SIMIX_host_self_get_name */
+#include "surf/surf.h"
 #include <stdio.h>
+#include "portable.h"
+
+extern const char *xbt_log_priority_names[8];
+extern int xbt_log_no_loc;
 
-extern const char *xbt_log_priority_names[7];
+static double simple_begin_of_time = -1;
 
-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;  
+#define check_overflow(len)                                             \
+  if ((rem_size -= (len)) > 0) {                                        \
+    p += (len);                                                         \
+  } else                                                                \
+    return 0
 
-  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);
+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;
+  const char *procname;
+  int len;
 
-  if (begin_of_time<0) 
-    begin_of_time=gras_os_time();
+  *p = '[';
+  check_overflow(1);
 
-  p = ev->buffer;
-  p += sprintf(p,"[");;
   /* Display the proc info if available */
-  if(strlen(xbt_procname()))
-    p += sprintf(p,"%s:%s:(%d) ", 
-		 gras_os_myname(), xbt_procname(),(*xbt_getpid)());
+  procname = xbt_procname();
+  if (procname && *procname) {
+    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 += sprintf(p,"%f] ", gras_os_time()-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)
-    p += sprintf(p, "%s:%d: ", ev->fileName, ev->lineNum);
+  /* 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);
+    check_overflow(len);
+  }
 
   /* Display category name */
-  p += sprintf(p, "[%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 */
-  p += vsprintf(p, fmt, ev->ap);
+  len = vsnprintf(p, rem_size, fmt, ev->ap);
+  check_overflow(len);
 
   /* End it */
-  p += sprintf(p, "\n");
+  *p = '\n';
+  check_overflow(1);
+  *p = '\0';
 
+  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 = surf_get_clock();
+
   return res;
 }