-/* $Id$ */
-
-/* layout_simple - a dumb log layout */
-
-/* Copyright (c) 2003, 2004 Martin Quinson. 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 <stdio.h>
-#include "portable.h"
-
-extern const char *xbt_log_priority_names[7];
-
-/* 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"); \
- }
-
-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();
-
- p = ev->buffer;
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"[");
-
- /* 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)());
-
- /* Display the date */
- 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 += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%s:%d: ", ev->fileName, ev->lineNum);
-
- /* Display category name */
- 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 += 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");
- check_overflow;
-}
-
-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;
- return res;
-}
+/* layout_simple - a dumb log layout */\r
+\r
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.\r
+ * All rights reserved. */\r
+\r
+/* This program is free software; you can redistribute it and/or modify it\r
+ * under the terms of the license (GNU LGPL) which comes with this package. */\r
+\r
+#include "xbt/sysdep.h"\r
+#include "xbt/strbuff.h" /* For dynamic version when the static one fails */\r
+#include "xbt/log_private.h"\r
+#include "xbt/synchro.h" /* xbt_thread_name */\r
+\r
+#include "gras/virtu.h"\r
+#include <stdio.h>\r
+#include "portable.h"\r
+\r
+extern const char *xbt_log_priority_names[8];\r
+extern int xbt_log_no_loc;\r
+\r
+static double simple_begin_of_time = -1;\r
+\r
+static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,\r
+ xbt_log_event_t ev,\r
+ const char *fmt,\r
+ xbt_log_appender_t app)\r
+{\r
+ xbt_strbuff_t buff = xbt_strbuff_new();\r
+ char loc_buff[256];\r
+ char *p;\r
+\r
+ /* Put every static information in a static buffer, and copy them in the dyn one */\r
+ p = loc_buff;\r
+ p += snprintf(p, 256 - (p - loc_buff), "[");\r
+\r
+ if (strlen(xbt_procname()))\r
+ p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ",\r
+ gras_os_myname(), xbt_procname(), (*xbt_getpid) ());\r
+ p +=\r
+ snprintf(p, 256 - (p - loc_buff), "%f] ",\r
+ gras_os_time() - simple_begin_of_time);\r
+ if (ev->priority != xbt_log_priority_info && xbt_log_no_loc==0)\r
+ p +=\r
+ snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,\r
+ ev->lineNum);\r
+ p +=\r
+ snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,\r
+ xbt_log_priority_names[ev->priority]);\r
+\r
+ xbt_strbuff_append(buff, loc_buff);\r
+\r
+ vasprintf(&p, fmt, ev->ap_copy);\r
+ xbt_strbuff_append(buff, p);\r
+ free(p);\r
+\r
+ xbt_strbuff_append(buff, "\n");\r
+\r
+ app->do_append(app, buff->data);\r
+ xbt_strbuff_free(buff);\r
+}\r
+\r
+/* only used after the format using: we suppose that the buffer is big enough to display our data */\r
+#undef check_overflow\r
+#define check_overflow \\r
+ do {if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { \\r
+ xbt_log_layout_simple_dynamic(l,ev,fmt,app); \\r
+ return ; \\r
+ } } while(0)\r
+\r
+static void xbt_log_layout_simple_doit(xbt_log_layout_t l,\r
+ xbt_log_event_t ev,\r
+ const char *fmt,\r
+ xbt_log_appender_t app)\r
+{\r
+ char *p;\r
+ const char *procname=xbt_procname();\r
+\r
+ xbt_assert0(ev->priority >= 0,\r
+ "Negative logging priority naturally forbidden");\r
+ xbt_assert1(ev->priority < sizeof(xbt_log_priority_names),\r
+ "Priority %d is greater than the biggest allowed value",\r
+ ev->priority);\r
+\r
+ p = ev->buffer;\r
+ p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");\r
+ check_overflow;\r
+\r
+ /* Display the proc info if available */\r
+\r
+ if (strlen(procname)) {\r
+ p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",\r
+ gras_os_myname(), procname, (*xbt_getpid) ());\r
+ check_overflow;\r
+ }\r
+\r
+ /* Display the date */\r
+ p +=\r
+ snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",\r
+ gras_os_time() - simple_begin_of_time);\r
+ check_overflow;\r
+\r
+ /* Display file position if not INFO */\r
+ if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc)\r
+ p +=\r
+ snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",\r
+ ev->fileName, ev->lineNum);\r
+\r
+ /* Display category name */\r
+ p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ",\r
+ ev->cat->name, xbt_log_priority_names[ev->priority]);\r
+\r
+ /* Display user-provided message */\r
+ p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), fmt, ev->ap);\r
+ check_overflow;\r
+\r
+ /* End it */\r
+ p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n");\r
+ check_overflow;\r
+ app->do_append(app, ev->buffer);\r
+}\r
+\r
+xbt_log_layout_t xbt_log_layout_simple_new(char *arg)\r
+{\r
+ xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);\r
+ res->do_layout = xbt_log_layout_simple_doit;\r
+\r
+ if (simple_begin_of_time < 0)\r
+ simple_begin_of_time = gras_os_time();\r
+\r
+ return res;\r
+}\r