/* 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
#include "xbt/log_private.h"
#include "xbt/synchro.h" /* xbt_thread_name */
-#include "gras/virtu.h"
+#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
+#include "surf/surf.h"
#include <stdio.h>
#include "portable.h"
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);
-
- if (vasprintf(&p, fmt, ev->ap_copy) == -1)
- xbt_die("vasprintf failed");
- 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 */
-#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; \
- }
+#define check_overflow(len) \
+ if ((rem_size -= (len)) > 0) { \
+ p += (len); \
+ } else \
+ return 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;
- 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);
-
- p = ev->buffer;
- p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[");
- check_overflow;
+ char *p = ev->buffer;
+ int rem_size = ev->buffer_size;
+ const char *procname;
+ int len;
+
+ *p = '[';
+ check_overflow(1);
/* Display the proc info if available */
procname = xbt_procname();
- if (strlen(procname)) {
- p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
- gras_os_myname(), procname, (*xbt_getpid) ());
- check_overflow;
+ 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() - simple_begin_of_time);
- check_overflow;
+ 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 && !xbt_log_no_loc)
- p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
- ev->fileName, ev->lineNum);
+ 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;
- app->do_append(app, ev->buffer);
+ *p = '\n';
+ check_overflow(1);
+ *p = '\0';
+
+ return 1;
}
xbt_log_layout_t xbt_log_layout_simple_new(char *arg)
res->do_layout = xbt_log_layout_simple_doit;
if (simple_begin_of_time < 0)
- simple_begin_of_time = gras_os_time();
+ simple_begin_of_time = surf_get_clock();
return res;
}
