#include "xbt/str.h"
#include "xbt/module.h" /* xbt_binary_name */
#include "xbt_modinter.h" /* backtrace initialization headers */
-#include "xbt/synchro.h" /* xbt_thread_self */
-#include "gras/Virtu/virtu_interface.h" /* gras_os_myname */
#include "xbt/ex_interface.h"
#undef HAVE_BACKTRACE
"** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
"** %s\n"
"** Thrown by %s()%s\n",
- gras_os_myname(), xbt_getpid(),
+ xbt_os_procname(), xbt_getpid(),
xbt_ex_catname(e->category), e->value, e->msg,
e->procname, thrower ? thrower : " in this process");
XBT_CRITICAL("%s", e->msg);
void __xbt_ex_terminate_default(xbt_ex_t * e)
{
xbt_ex_display(e);
-
- abort();
+ xbt_abort();
}
/* the externally visible API */
{
switch (cat) {
case unknown_error:
- return "unknown_err";
+ return "unknown error";
case arg_error:
- return "invalid_arg";
+ return "invalid argument";
+ case bound_error:
+ return "out of bounds";
case mismatch_error:
return "mismatch";
case not_found_error:
return "not found";
case system_error:
- return "system_err";
+ return "system error";
case network_error:
- return "network_err";
+ return "network error";
case timeout_error:
return "timeout";
+ case cancel_error:
+ return "action canceled";
case thread_error:
- return "thread_err";
- default:
- return "INVALID_ERR";
+ return "thread error";
+ case host_error:
+ return "host failed";
+ case tracing_error:
+ return "tracing error";
+ case io_error:
+ return "io error";
}
+ return "INVALID ERROR";
}
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"))