X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0dcda218187c4874a539a6887b132ed5e6cc77dd..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/xbt_log_layout_format.c diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c index a54136216d..7c41b5b706 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -1,25 +1,16 @@ /* layout_simple - a dumb log layout */ -/* Copyright (c) 2007-2014. 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 "src/internal_config.h" /* execinfo when available */ -#include "xbt/synchro_core.h" /* xbt_thread_self_name */ -#include "src/xbt/ex_interface.h" -#include "xbt/sysdep.h" -#include "xbt/strbuff.h" +#include "simgrid/host.h" #include "src/xbt/log_private.h" -#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ #include "surf/surf.h" +#include "xbt/sysdep.h" #include -#if HAVE_EXECINFO_H -# include /* Function backtrace */ -#endif - extern const char *xbt_log_priority_names[8]; static double format_begin_of_time = -1; @@ -31,7 +22,6 @@ static double format_begin_of_time = -1; " 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" @@ -53,7 +43,8 @@ static double format_begin_of_time = -1; #define show_it(data, letter) \ if (1) { \ - int len, wd; \ + int len; \ + int wd; \ if (length == -1) { \ wd = 0; \ } else { \ @@ -77,17 +68,14 @@ static double format_begin_of_time = -1; #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: @@ -95,6 +83,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, case '\0': fprintf(stderr, "Layout format (%s) ending with %%\n", (char *)l->data); xbt_abort(); + break; case '%': *p = '%'; check_overflow(1); @@ -123,19 +112,16 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, 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(SIMIX_host_self_get_name()); - break; - case 't': /* thread name; LOG4J compliant */ - show_string(SIMIX_process_self_get_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; @@ -146,9 +132,9 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, 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; } @@ -158,35 +144,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, 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 HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE) - { - xbt_ex_t e; - - e.used = backtrace((void **) e.bt, XBT_BACKTRACE_SIZE); - e.bt_strings = NULL; - e.msg = NULL; - 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(surf_get_clock()); break; @@ -194,9 +151,12 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, 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; } @@ -222,8 +182,8 @@ static void xbt_log_layout_format_free(xbt_log_layout_t lay) 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)