#include "portable.h" /* execinfo when available */
#include "xbt/ex.h"
#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 "xbt/ex_interface.h"
"** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
"** %s\n"
"** Thrown by %s()%s\n",
- xbt_os_procname(), xbt_getpid(),
+ 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_ex_t ex;
int r1;
int _XBT_GNUC_UNUSED r2;
- volatile int v1, v2;
+ int v1;
+ volatile int v2;
r1 = r2 = v1 = v2 = 1234;
TRY {