#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)
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
-#if defined(_XBT_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
+#if defined(_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
#endif
if (e->used == 0) {
fprintf(stderr, "(backtrace not set)\n");
} else {
- int i;
-
- fprintf(stderr, "Backtrace (displayed in thread %p):\n",
- (void *) xbt_thread_self());
- for (i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
+ fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name());
+ for (int i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4);
}
e->msg = NULL;
xbt_ex_free(*e);
#else
-
XBT_ERROR("No backtrace on this arch");
#endif
}
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
-#elif (defined(_XBT_WIN32) && defined (_M_IX86)) && !defined(__GNUC__)
-# include "src/xbt/backtrace_windows.c"
#else
# include "src/xbt/backtrace_dummy.c"
#endif
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;
} else
#endif
- {
- fprintf(stderr,
- "\n"
- "** In %s() at %s:%d\n"
- "** (no backtrace available)\n",
- e->func, e->file, e->line);
- }
+ fprintf(stderr, "\n"
+ "** In %s() at %s:%d\n"
+ "** (no backtrace available)\n", e->func, e->file, e->line);
}
void xbt_ex_free(xbt_ex_t e)
{
- int i;
-
free(e.msg);
if (e.bt_strings) {
- for (i = 0; i < e.used; i++)
+ for (int i = 0; i < e.used; i++)
free(e.bt_strings[i]);
free(e.bt_strings);
}
- /* memset(e,0,sizeof(xbt_ex_t)); */
}
/** \brief returns a short name for the given exception category */