Avoid (almost) duplicated code in xbt_log_layout_*.

[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 26de2a0..ac603b4 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -1,6 +1,6 @@
 /* layout_simple - a dumb log layout                                        */
 
 /* layout_simple - a dumb log layout                                        */
 

-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2011. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -20,54 +20,18 @@ extern int xbt_log_no_loc;
 
 static double simple_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,
-                                          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 - loc_buff), "[");
-
-  if (strlen(xbt_procname()))
-    p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ",
-                  gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
-  p += 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 - loc_buff), "%s:%d: ", ev->fileName,
-                  ev->lineNum);
-  p += snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
-                xbt_log_priority_names[ev->priority]);
-
-  xbt_strbuff_append(buff, loc_buff);
-
-  p = bvprintf(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);
-}
+#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 */ \
 
 /* 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);                   \
-    return;                                                        \
+    return 0;                                                      \

   } else ((void)0)
 
   } else ((void)0)
 

-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)
+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;
 {
   char *p;
   const char *procname = NULL;


@@ -113,7 +77,8 @@ 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;
   /* End it */
   p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n");
   check_overflow;

-  app->do_append(app, ev->buffer);
+
+  return 1;

 }
 
 xbt_log_layout_t xbt_log_layout_simple_new(char *arg)
 }
 
 xbt_log_layout_t xbt_log_layout_simple_new(char *arg)