Do append the right buffer to the message when we switched to dynamic logs; be more...

[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 1b0e3c0..867294c 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -8,25 +8,62 @@
  * 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 loc_buff[256];
+   char *p;
+   
+   /* 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),"[");
+
+   if(strlen(xbt_procname()))
+     p += snprintf(p,256-(p-ev->buffer),"%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)
+     p += snprintf(p,256-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum);
+   p += snprintf(p,256-(p-ev->buffer), "[%s/%s] ", 
+                ev->cat->name, xbt_log_priority_names[ev->priority] );
+   
+   xbt_strbuff_append(buff,loc_buff);
+
+   vasprintf(&p,fmt,ev->ap_copy);
+   xbt_strbuff_append(buff,p);
+   free(p);
+
+   xbt_strbuff_append(buff,"\n");
+
+   app->do_append(app,buff->data);
+   xbt_strbuff_free(buff);
+}
+
 /* 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 */ \
-     p=ev->buffer + XBT_LOG_BUFF_SIZE - strlen(" >> OUTPUT TRUNCATED <<\n"); \
-     p+=sprintf(p," >> OUTPUT TRUNCATED <<\n"); \
+     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) {
-  static double begin_of_time = -1;
+                                      const char *fmt,
+                                      xbt_log_appender_t app) {
   char *p;  
 
   xbt_assert0(ev->priority>=0,
@@ -40,14 +77,18 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
 
   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()))
+  if(strlen(xbt_procname())) {
     p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", 
                 gras_os_myname(), xbt_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);
+  check_overflow;
 
   /* Display file position if not INFO*/
   if (ev->priority != xbt_log_priority_info)
@@ -64,6 +105,7 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
   /* End it */
   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) {