-/* $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 "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[7];
+extern const char *xbt_log_priority_names[8];
+extern int xbt_log_no_loc;
-/* 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 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 = ev->buffer;
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"[");
+ *p = '[';
+ check_overflow(1);
/* 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)());
+ 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 += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%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 += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "%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 += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "[%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 += vsnprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), fmt, ev->ap);
- check_overflow;
-
+ len = vsnprintf(p, rem_size, fmt, ev->ap);
+ check_overflow(len);
+
/* End it */
- p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer), "\n");
- check_overflow;
+ *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;
}
