X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7410b72db09489e8b9d3ee3cb087f35882397d93..df3bdefc3df0a0810cf48411dd588ed63c65a302:/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 64162da8a1..4dca16363e 100644
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -1,14 +1,11 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2016. 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 "src/xbt/log_private.h"
@@ -157,13 +154,13 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
         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);
@@ -178,7 +175,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
             show_string(buff->data);
             xbt_strbuff_free(buff);
           }
-          xbt_ex_free(e);
         }
 #else
         show_string("(no backtrace on this arch)");
@@ -219,8 +215,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)