#include <stdio.h>
#include <stdlib.h>
-#include "portable.h" /* execinfo when available */
+#include "src/portable.h" /* execinfo when available */
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/synchro_core.h"
-#include "xbt_modinter.h" /* backtrace initialization headers */
+#include "src/xbt_modinter.h" /* backtrace initialization headers */
-#include "xbt/ex_interface.h"
+#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);
}
}
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
-# include "backtrace_linux.c"
+# include "src/xbt/backtrace_linux.c"
#elif (defined(_XBT_WIN32) && defined (_M_IX86)) && !defined(__GNUC__)
-# include "backtrace_windows.c"
+# include "src/xbt/backtrace_windows.c"
#else
-# include "backtrace_dummy.c"
+# include "src/xbt/backtrace_dummy.c"
#endif
/** @brief shows an exception content and the associated stack if available */
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;
#define SMALLAMOUNT 10
#define TOOBIG 100000000
-#if 0 /* this contains syntax errors, actually */
-static void bad_example(void)
-{
- struct {
- char *first;
- } *globalcontext;
- ex_t ex;
-
- /* BAD_EXAMPLE */
- TRY {
- char *cp1, *cp2, *cp3;
-
- cp1 = mallocex(SMALLAMOUNT);
- globalcontext->first = cp1;
- cp2 = mallocex(TOOBIG);
- cp3 = mallocex(SMALLAMOUNT);
- strcpy(cp1, "foo");
- strcpy(cp2, "bar");
- }
- TRY_CLEANUP {
- free(cp3);
- free(cp2);
- free(cp1);
- }
- CATCH_ANONYMOUS {
- printf("cp3=%s", cp3);
- RETHROW;
- }
- /* end_of_bad_example */
-}
-#endif
typedef struct {
char *first;
} global_context_t;