X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0dcda218187c4874a539a6887b132ed5e6cc77dd..b51da37243dc16575499f4cb7729fe8bdd7fa514:/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..594f001f50 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -8,7 +8,6 @@ #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 "src/xbt/log_private.h" @@ -77,9 +76,7 @@ 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; @@ -123,8 +120,7 @@ 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 */ @@ -160,13 +156,13 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, 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) +// TODO, backtrace +#if 0 && HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE) { - xbt_ex_t e; + 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); @@ -181,7 +177,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, show_string(buff->data); xbt_strbuff_free(buff); } - xbt_ex_free(e); } #else show_string("(no backtrace on this arch)");