/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-2011. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. The SimGrid Team. */
/* 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 "portable.h" /* execinfo when available */
-#include "xbt/ex_interface.h"
+#include "simgrid/host.h"
+#include "src/xbt/log_private.h"
+#include "surf/surf.h"
#include "xbt/sysdep.h"
-#include "xbt/strbuff.h"
-#include "xbt/log_private.h"
-#include "gras/virtu.h" /* gras_os_myname (KILLME) */
-#include "xbt/synchro.h" /* xbt_thread_self_name */
#include <stdio.h>
extern const char *xbt_log_priority_names[8];
" where:\n" \
" source: %%F: file %%L: line %%M: function %%l: location (%%F:%%L)\n" \
" runtime: %%h: hostname %%t: thread %%P: process %%i: PID\n" \
- " backtrace: %%b: full %%B: short\n" \
" when: %%d: date %%r: app. age\n" \
" other: %%%%: %% %%n: new line %%e: plain space\n"
#define show_it(data, letter) \
if (1) { \
- int len, wd; \
+ int len; \
+ int wd; \
if (length == -1) { \
wd = 0; \
} else { \
check_overflow(len); \
} else (void)0
-#define show_string(data) show_it(data, "s")
+#define show_string(data) \
+ if (1) { \
+ const char *show_string_data = (data); \
+ show_it(show_string_data ? show_string_data : "(null)", "s"); \
+ } else (void)0
#define show_int(data) show_it(data, "d")
#define show_double(data) show_it(data, "f")
-static int xbt_log_layout_format_doit(xbt_log_layout_t l,
- xbt_log_event_t ev,
- const char *msg_fmt)
+static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, const char *msg_fmt)
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
int precision = -1;
int length = -1;
- char *q;
- for (q = l->data ; *q != '\0' ; q++) {
+ for (char* q = l->data ; *q != '\0' ; q++) {
if (*q == '%') {
q++;
handle_modifier:
switch (*q) {
case '\0':
- xbt_die("Layout format (%s) ending with %%\n", (char *)l->data);
+ fprintf(stderr, "Layout format (%s) ending with %%\n", (char *)l->data);
+ xbt_abort();
+ break;
case '%':
*p = '%';
check_overflow(1);
length = strtol(q, &q, 10);
goto handle_modifier;
case 'c': /* category name; LOG4J compliant
- should accept a precision postfix to show the
- hierarchy */
+ should accept a precision postfix to show the hierarchy */
show_string(ev->cat->name);
break;
case 'p': /* priority name; LOG4J compliant */
show_string(xbt_log_priority_names[ev->priority]);
break;
case 'h': /* host name; SimGrid extension */
- show_string(gras_os_myname());
- break;
- case 't': /* thread name; LOG4J compliant */
- show_string(xbt_thread_self_name());
+ show_string(sg_host_self_get_name());
break;
+ case 't': /* thread/process name; LOG4J compliant */
case 'P': /* process name; SimGrid extension */
show_string(xbt_procname());
break;
show_string(ev->fileName);
break;
case 'l': { /* location; LOG4J compliant */
- int len, sz;
+ int sz;
set_sz_from_precision();
- len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
+ int len = snprintf(p, sz, "%s:%d", ev->fileName, ev->lineNum);
check_overflow(MIN(sz, len));
break;
}
case 'M': /* method (ie, function) name; LOG4J compliant */
show_string(ev->functionName);
break;
- case 'b': /* backtrace; called %throwable in LOG4J */
- case 'B': /* short backtrace; called %throwable{short} in LOG4J */
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
- {
- xbt_ex_t e;
-
- e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE);
- e.bt_strings = NULL;
- e.msg = NULL;
- e.remote = 0;
- xbt_ex_setup_backtrace(&e);
- if (*q == 'B') {
- show_string(e.bt_strings[1] + 8);
- } else {
- xbt_strbuff_t buff = xbt_strbuff_new();
- int i;
- xbt_strbuff_append(buff, e.bt_strings[1] + 8);
- for (i = 2; i < e.used; i++) {
- xbt_strbuff_append(buff, "\n");
- xbt_strbuff_append(buff, e.bt_strings[i] + 8);
- }
- show_string(buff->data);
- xbt_strbuff_free(buff);
- }
- xbt_ex_free(e);
- }
-#else
- show_string("(no backtrace on this arch)");
-#endif
- break;
case 'd': /* date; LOG4J compliant */
- show_double(gras_os_time());
+ show_double(surf_get_clock());
break;
case 'r': /* application age; LOG4J compliant */
- show_double(gras_os_time() - format_begin_of_time);
+ show_double(surf_get_clock() - format_begin_of_time);
break;
case 'm': { /* user-provided message; LOG4J compliant */
- int len, sz;
+ int sz;
set_sz_from_precision();
- len = vsnprintf(p, sz, msg_fmt, ev->ap);
+ va_list ap;
+ va_copy(ap, ev->ap);
+ int len = vsnprintf(p, sz, msg_fmt, ap);
+ va_end(ap);
check_overflow(MIN(sz, len));
break;
}
default:
- xbt_die(ERRMSG, *q, (char *)l->data);
+ fprintf(stderr, ERRMSG, *q, (char *)l->data);
+ xbt_abort();
}
} else {
*p = *q;
xbt_log_layout_t xbt_log_layout_format_new(char *arg)
{
xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
- res->do_layout = xbt_log_layout_format_doit;
- res->free_ = xbt_log_layout_format_free;
+ res->do_layout = &xbt_log_layout_format_doit;
+ res->free_ = &xbt_log_layout_format_free;
res->data = xbt_strdup((char *) arg);
if (format_begin_of_time < 0)
- format_begin_of_time = gras_os_time();
+ format_begin_of_time = surf_get_clock();
return res;
}
