xbt_ex_free(*e);
#else
- ERROR0("No backtrace on this arch");
+ XBT_ERROR("No backtrace on this arch");
#endif
}
gras_os_myname(), (*xbt_getpid) (),
xbt_ex_catname(e->category), e->value, e->msg,
e->procname, thrower ? thrower : " in this process");
- CRITICAL1("%s", e->msg);
+ XBT_CRITICAL("%s", e->msg);
if (!e->remote && !e->bt_strings)
xbt_ex_setup_backtrace(e);
xbt_ex_t ex;
volatile int n = 1;
- xbt_test_add0("basic nested control flow");
+ xbt_test_add("basic nested control flow");
TRY {
if (n != 1)
- xbt_test_fail1("M1: n=%d (!= 1)", n);
+ xbt_test_fail("M1: n=%d (!= 1)", n);
n++;
TRY {
if (n != 2)
- xbt_test_fail1("M2: n=%d (!= 2)", n);
+ xbt_test_fail("M2: n=%d (!= 2)", n);
n++;
- THROW0(unknown_error, 0, "something");
+ THROWF(unknown_error, 0, "something");
}
CATCH(ex) {
if (n != 3)
- xbt_test_fail1("M3: n=%d (!= 3)", n);
+ xbt_test_fail("M3: n=%d (!= 3)", n);
n++;
xbt_ex_free(ex);
}
n++;
TRY {
if (n != 5)
- xbt_test_fail1("M2: n=%d (!= 5)", n);
+ xbt_test_fail("M2: n=%d (!= 5)", n);
n++;
- THROW0(unknown_error, 0, "something");
+ THROWF(unknown_error, 0, "something");
}
- CATCH(ex) {
+ CATCH_ANONYMOUS {
if (n != 6)
- xbt_test_fail1("M3: n=%d (!= 6)", n);
+ xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
RETHROW;
n++;
}
- xbt_test_fail1("MX: n=%d (shouldn't reach this point)", n);
+ xbt_test_fail("MX: n=%d (shouldn't reach this point)", n);
}
CATCH(ex) {
if (n != 7)
- xbt_test_fail1("M4: n=%d (!= 7)", n);
+ xbt_test_fail("M4: n=%d (!= 7)", n);
n++;
xbt_ex_free(ex);
}
if (n != 8)
- xbt_test_fail1("M5: n=%d (!= 8)", n);
+ xbt_test_fail("M5: n=%d (!= 8)", n);
}
XBT_TEST_UNIT("value", test_value, "exception value passing")
xbt_ex_t ex;
TRY {
- THROW0(unknown_error, 2, "toto");
+ THROWF(unknown_error, 2, "toto");
}
CATCH(ex) {
- xbt_test_add0("exception value passing");
+ xbt_test_add("exception value passing");
if (ex.category != unknown_error)
- xbt_test_fail1("category=%d (!= 1)", ex.category);
+ xbt_test_fail("category=%d (!= 1)", ex.category);
if (ex.value != 2)
- xbt_test_fail1("value=%d (!= 2)", ex.value);
+ xbt_test_fail("value=%d (!= 2)", ex.value);
if (strcmp(ex.msg, "toto"))
- xbt_test_fail1("message=%s (!= toto)", ex.msg);
+ xbt_test_fail("message=%s (!= toto)", ex.msg);
xbt_ex_free(ex);
}
}
TRY {
r2 = 5678;
v2 = 5678;
- THROW0(unknown_error, 0, "toto");
- } CATCH(ex) {
- xbt_test_add0("variable preservation");
+ THROWF(unknown_error, 0, "toto");
+ }
+ CATCH(ex) {
+ xbt_test_add("variable preservation");
if (r1 != 1234)
- xbt_test_fail1("r1=%d (!= 1234)", r1);
+ xbt_test_fail("r1=%d (!= 1234)", r1);
if (v1 != 1234)
- xbt_test_fail1("v1=%d (!= 1234)", v1);
+ xbt_test_fail("v1=%d (!= 1234)", v1);
/* r2 is allowed to be destroyed because not volatile */
if (v2 != 5678)
- xbt_test_fail1("v2=%d (!= 5678)", v2);
+ xbt_test_fail("v2=%d (!= 5678)", v2);
xbt_ex_free(ex);
}
}
volatile int v1;
int c;
- xbt_test_add0("cleanup handling");
+ xbt_test_add("cleanup handling");
v1 = 1234;
c = 0;
TRY {
v1 = 5678;
- THROW0(1, 2, "blah");
- } TRY_CLEANUP {
+ THROWF(1, 2, "blah");
+ }
+ TRY_CLEANUP {
if (v1 != 5678)
- xbt_test_fail1("v1 = %d (!= 5678)", v1);
+ xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
}
CATCH(ex) {
if (v1 != 5678)
- xbt_test_fail1("v1 = %d (!= 5678)", v1);
+ xbt_test_fail("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
- xbt_test_fail0("unexpected exception contents");
+ xbt_test_fail("unexpected exception contents");
xbt_ex_free(ex);
}
if (!c)
- xbt_test_fail0("xbt_ex_free not executed");
+ xbt_test_fail("xbt_ex_free not executed");
}
cp3 = mallocex(SMALLAMOUNT);
strcpy(cp1, "foo");
strcpy(cp2, "bar");
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
if (cp3 != NULL)
free(cp3);
if (cp2 != NULL)
if (cp1 != NULL)
free(cp1);
}
- CATCH(ex) {
+ 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);
free(cp2);
/*05 cp1 was given away */
}
- CATCH(ex) {
+ CATCH_ANONYMOUS {
/*05 global context untouched */
RETHROW;
}