#include <stdio.h>
#include <stdlib.h>
-#include "src/portable.h" /* execinfo when available */
+#include "src/internal_config.h" /* execinfo when available */
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/synchro_core.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)
-# define HAVE_BACKTRACE 1 /* Hello linux box */
-#endif
-
-#if defined(_XBT_WIN32) && defined(_M_IX86) && !defined(__GNUC__)
-# define HAVE_BACKTRACE 1 /* Hello x86 windows box */
-#endif
-
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER;
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
}
xbt_backtrace_display(&e);
}
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+#if HAVE_BACKTRACE && HAVE_EXECINFO_H && 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
if (e->pid != xbt_getpid())
thrower = bprintf(" on process %d",e->pid);
- fprintf(stderr,
- "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
+ fprintf(stderr, "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
"** %s\n"
"** Thrown by %s()%s\n",
- xbt_binary_name, xbt_getpid(),
- xbt_ex_catname(e->category), e->value, e->msg,
+ xbt_binary_name, xbt_getpid(), xbt_ex_catname(e->category), e->value, e->msg,
e->procname, thrower ? thrower : " in this process");
XBT_CRITICAL("%s", e->msg);
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 = xbt_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;
fprintf(stderr, "%s\n", e->bt_strings[i]);
}
}
-
} 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);
}
-
/* default __ex_terminate callback function */
void __xbt_ex_terminate_default(xbt_ex_t * e)
{
XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
-
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 */
return "io error";
case vm_error:
return "vm error";
-
}
return "INVALID ERROR";
}
-
#ifdef SIMGRID_TEST
#include <stdio.h>
#include "xbt/ex.h"
xbt_test_fail("M2: n=%d (!= 2)", n);
n++;
THROWF(unknown_error, 0, "something");
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (n != 3)
xbt_test_fail("M3: n=%d (!= 3)", n);
n++;
xbt_test_fail("M2: n=%d (!= 5)", n);
n++;
THROWF(unknown_error, 0, "something");
- }
- CATCH_ANONYMOUS {
+ } CATCH_ANONYMOUS {
if (n != 6)
xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
n++;
}
xbt_test_fail("MX: n=%d (shouldn't reach this point)", n);
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (n != 7)
xbt_test_fail("M4: n=%d (!= 7)", n);
n++;
TRY {
THROWF(unknown_error, 2, "toto");
- }
- CATCH(ex) {
+ } CATCH(ex) {
xbt_test_add("exception value passing");
if (ex.category != unknown_error)
xbt_test_fail("category=%d (!= 1)", (int)ex.category);
r2 = 5678;
v2 = 5678;
THROWF(unknown_error, 0, "toto");
- }
- CATCH(ex) {
+ } CATCH(ex) {
xbt_test_add("variable preservation");
if (r1 != 1234)
xbt_test_fail("r1=%d (!= 1234)", r1);
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
- }
- CATCH(ex) {
+ } CATCH(ex) {
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
xbt_test_fail("xbt_ex_free not executed");
}
-
/*
* The following is the example included in the documentation. It's a good
* idea to check its syntax even if we don't try to run it.
