XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mecanism");
+XBT_EXPORT_NO_IMPORT(const xbt_running_ctx_t) __xbt_ex_ctx_initializer = XBT_RUNNING_CTX_INITIALIZER;
+
/* default __ex_ctx callback function */
xbt_running_ctx_t *__xbt_ex_ctx_default(void)
{
fprintf(stderr, "Backtrace (displayed in thread %p):\n",
(void *) xbt_thread_self());
- for (i = 1; i < e->used; i++) /* no need to display "xbt_display_backtrace" */
+ for (i = 1; i < e->used; i++) /* no need to display "xbt_backtrace_display" */
fprintf(stderr, "---> %s\n", e->bt_strings[i] + 4);
}
"** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
"** %s\n"
"** Thrown by %s()%s\n",
- gras_os_myname(), (*xbt_getpid) (),
+ gras_os_myname(), 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 (!e->remote && !e->bt_strings)
xbt_ex_setup_backtrace(e);
#ifdef HAVE_BACKTRACE
- /* We have everything to build neat backtraces */
- {
+ if (e->used && e->bt_strings) {
+ /* We have everything to build neat backtraces */
int i;
- if (!xbt_binary_name) {
- fprintf(stderr, "variable 'xbt_binary_name' set to NULL. Cannot compute the backtrace\n");
- return;
- }
fprintf(stderr, "\n");
for (i = 0; i < e->used; i++)
fprintf(stderr, "%s\n", e->bt_strings[i]);
- }
-#else
- fprintf(stderr, " at %s:%d:%s (no backtrace available on that arch)\n",
- e->file, e->line, e->func);
+ } else
#endif
+ {
+ fprintf(stderr,
+ "\n"
+ "** In %s() at %s:%d\n"
+ "** (no backtrace available)\n",
+ e->func, e->file, e->line);
+ }
}
{
int i;
- if (e.msg)
- free(e.msg);
+ free(e.msg);
if (e.remote) {
free(e.procname);
free(e.file);
if (e.bt_strings) {
for (i = 0; i < e.used; i++)
- free((char *) e.bt_strings[i]);
- free((char **) e.bt_strings);
+ free(e.bt_strings[i]);
+ free(e.bt_strings);
}
/* memset(e,0,sizeof(xbt_ex_t)); */
}
CATCH(ex) {
xbt_test_add("exception value passing");
if (ex.category != unknown_error)
- xbt_test_fail("category=%d (!= 1)", ex.category);
+ xbt_test_fail("category=%d (!= 1)", (int)ex.category);
if (ex.value != 2)
xbt_test_fail("value=%d (!= 2)", ex.value);
if (strcmp(ex.msg, "toto"))
XBT_TEST_UNIT("variables", test_variables, "variable value preservation")
{
xbt_ex_t ex;
- int r1, r2;
+ int r1;
+ int _XBT_GNUC_UNUSED r2;
volatile int v1, v2;
r1 = r2 = v1 = v2 = 1234;
strcpy(cp2, "bar");
}
TRY_CLEANUP {
- if (cp3 != NULL)
- free(cp3);
- if (cp2 != NULL)
- free(cp2);
- if (cp1 != NULL)
- free(cp1);
+ free(cp3);
+ free(cp2);
+ free(cp1);
}
CATCH_ANONYMOUS {
printf("cp3=%s", cp3);
}
TRY_CLEANUP { /*04 */
printf("cp3=%s", cp3 == NULL /*02 */ ? "" : cp3);
- if (cp3 != NULL)
- free(cp3);
- if (cp2 != NULL)
- free(cp2);
+ free(cp3);
+ free(cp2);
/*05 cp1 was given away */
}
CATCH_ANONYMOUS {