#include "src/xbt/ex_interface.h"
#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
#undef HAVE_BACKTRACE
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
} else {
int i;
- fprintf(stderr, "Backtrace (displayed in thread %p):\n",
- (void *) xbt_thread_self());
+ fprintf(stderr, "Backtrace (displayed in process %s):\n",
+ SIMIX_process_self_get_name());
for (i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4);
}
xbt_free(thrower);
if (xbt_initialized==0 || smx_cleaned) {
- fprintf(stderr, "Ouch. SimGrid is not initialized yet, or already closing. No backtrace available.\n");
- return; /* Not started yet or already closing. Trying to generate a backtrace would probably fail */
+ fprintf(stderr, "Ouch. SimGrid is not initialized yet, or already closing. No backtrace available.\n");
+ return; /* Not started yet or already closing. Trying to generate a backtrace would probably fail */
}
if (!e->bt_strings)
if (e->used && e->bt_strings) {
/* We have everything to build neat backtraces */
int i;
+ int cutpath = 0;
+ TRY { // We don't want to have an exception while checking how to deal with the one we already have, do we?
+ cutpath = sg_cfg_get_boolean("exception/cutpath");
+ } CATCH_ANONYMOUS { }
fprintf(stderr, "\n");
for (i = 0; i < e->used; i++) {
- if (sg_cfg_get_boolean("exception/cutpath")) {
+
+ if (cutpath) {
char* p = e->bt_strings[i];
xbt_str_rtrim(p, ":0123456789");
char* filename = strrchr(p, '/')+1;