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);
{
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)); */
}
n++;
THROWF(unknown_error, 0, "something");
}
- CATCH(ex) {
+ CATCH_ANONYMOUS {
if (n != 6)
xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
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);
TRY {
v1 = 5678;
THROWF(1, 2, "blah");
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
if (v1 != 5678)
xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
cp3 = mallocex(SMALLAMOUNT);
strcpy(cp1, "foo");
strcpy(cp2, "bar");
- } TRY_CLEANUP {
- if (cp3 != NULL)
- free(cp3);
- if (cp2 != NULL)
- free(cp2);
- if (cp1 != NULL)
- free(cp1);
}
- CATCH(ex) {
+ TRY_CLEANUP {
+ free(cp3);
+ free(cp2);
+ free(cp1);
+ }
+ CATCH_ANONYMOUS {
printf("cp3=%s", cp3);
RETHROW;
}
static void good_example(void)
{
global_context_t *global_context = malloc(sizeof(global_context_t));
- xbt_ex_t ex;
/* GOOD_EXAMPLE */
{ /*01 */
cp3 = mallocex(SMALLAMOUNT);
strcpy(cp1, "foo");
strcpy(cp2, "bar");
- } TRY_CLEANUP { /*04 */
+ }
+ 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(ex) {
+ CATCH_ANONYMOUS {
/*05 global context untouched */
RETHROW;
}