Do not truncate the output on large messages, but switch to a dynamically allocated...

[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 adc5da5..0ae8480 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -8,19 +8,61 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/sysdep.h"
-#include "xbt/log.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 "gras/virtu.h"
 #include <stdio.h>
+#include "portable.h"
 
 extern const char *xbt_log_priority_names[7];
 
+static double begin_of_time = -1;
+
+static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
+                                         xbt_log_event_t ev,
+                                         const char*fmt,
+                                         xbt_log_appender_t app) {
+   xbt_strbuff_t buff = xbt_strbuff_new();
+   char *p;
+   
+   /* Put every static information in the static buffer, and copy them in the dyn one */
+   p = ev->buffer;
+   p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"[");
+
+   if(strlen(xbt_procname()))
+     p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", 
+                  gras_os_myname(), xbt_procname(),(*xbt_getpid)());
+   p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%f] ", gras_os_time()-begin_of_time);
+   if (ev->priority != xbt_log_priority_info)
+     p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum);
+   p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "[%s/%s] ", 
+                ev->cat->name, xbt_log_priority_names[ev->priority] );
+   
+   xbt_strbuff_append(buff,ev->buffer);
+
+   vasprintf(&p,fmt,ev->ap);
+   xbt_strbuff_append(buff,p);
+   free(p);
+
+   xbt_strbuff_append(buff,"\n");
+
+   app->do_append(app,buff->data);
+   xbt_strbuff_free(buff);
+}
 
-static char *xbt_log_layout_simple_doit(xbt_log_layout_t l,
-                                       xbt_log_event_t ev, 
-                                       const char *fmt) {
-  static char res[1024];
-  static double begin_of_time = -1;
+/* only used after the format using: we suppose that the buffer is big enough to display our data */
+#define check_overflow \
+  if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \
+     xbt_log_layout_simple_dynamic(l,ev,fmt,app); \
+     return; \
+  } 
+
+static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
+                                      xbt_log_event_t ev, 
+                                      const char *fmt,
+                                      xbt_log_appender_t app) {
   char *p;  
 
   xbt_assert0(ev->priority>=0,
@@ -32,32 +74,33 @@ static char *xbt_log_layout_simple_doit(xbt_log_layout_t l,
   if (begin_of_time<0) 
     begin_of_time=gras_os_time();
 
-  p = res;
-  p += sprintf(res,"[");;
+  p = ev->buffer;
+  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"[");
+
   /* Display the proc info if available */
   if(strlen(xbt_procname()))
-    p += sprintf(p,"%s:%s:(%d):%s ", 
-                gras_os_myname(), xbt_procname(),(*xbt_getpid)(),xbt_thread_self_name());
+    p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", 
+                gras_os_myname(), xbt_procname(),(*xbt_getpid)());
 
   /* Display the date */
-  p += sprintf(p,"%f] ", gras_os_time()-begin_of_time);
-
+  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%f] ", gras_os_time()-begin_of_time);
 
   /* Display file position if not INFO*/
   if (ev->priority != xbt_log_priority_info)
-    p += sprintf(p, "%s:%d: ", ev->fileName, ev->lineNum);
+    p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum);
 
   /* Display category name */
-  p += sprintf(p, "[%s/%s] ", 
+  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "[%s/%s] ", 
               ev->cat->name, xbt_log_priority_names[ev->priority] );
 
   /* Display user-provided message */
-  p += vsprintf(p, fmt, ev->ap);
-
+  p += vsnprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), fmt, ev->ap);
+  check_overflow;
+   
   /* End it */
-  p += sprintf(p, "\n");
-
-  return res;
+  p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "\n");
+  check_overflow;
+  app->do_append(app,ev->buffer);
 }
 
 xbt_log_layout_t xbt_log_layout_simple_new(char *arg) {