/* ex - Exception Handling */
-/* Copyright (c) 2005-2010 The SimGrid team */
+/* Copyright (c) 2005-2014. The SimGrid Team.
+ * All rights reserved. */
+
/* Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> */
/* Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/> */
/* Copyright (c) 2002-2004 Cable & Wireless <http://www.cw.com/> */
#include "portable.h" /* execinfo when available */
#include "xbt/ex.h"
#include "xbt/str.h"
-#include "xbt/module.h" /* xbt_binary_name */
+#include "xbt/synchro_core.h"
#include "xbt_modinter.h" /* backtrace initialization headers */
#include "xbt/ex_interface.h"
+#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+
#undef HAVE_BACKTRACE
#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
real life and in simulation when using threads to implement the simulation
processes (ie, with pthreads and on windows).
- It also gets overriden in xbt/context.c when using ucontextes (as well as
+ It also gets overriden in xbt/context.c when using ucontexts (as well as
in Java for now, but after the java overhaul, it will get cleaned out)
*/
static xbt_running_ctx_t ctx = XBT_RUNNING_CTX_INITIALIZER;
/* don't fool xbt_ex_free with uninitialized msg field */
e->msg = NULL;
- e->remote = 0;
xbt_ex_free(*e);
#else
void xbt_ex_display(xbt_ex_t * e)
{
char *thrower = NULL;
-
- if (e->remote)
- thrower = bprintf(" on host %s(%d)", e->host, e->pid);
+ if (e->pid != xbt_getpid())
+ thrower = bprintf(" on process %d",e->pid);
fprintf(stderr,
"** 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_free(thrower);
- if (!e->remote && !e->bt_strings)
+ if (!e->bt_strings)
xbt_ex_setup_backtrace(e);
#ifdef HAVE_BACKTRACE
int i;
fprintf(stderr, "\n");
- for (i = 0; i < e->used; i++)
- fprintf(stderr, "%s\n", e->bt_strings[i]);
+ for (i = 0; i < e->used; i++) {
+ if (sg_cfg_get_boolean("exception/cutpath")) {
+ char* p = e->bt_strings[i];
+ xbt_str_rtrim(p, ":0123456789");
+ char* filename = strrchr(p, '/')+1;
+ char* end_of_message = strrchr(p, ' ');
+
+ int length = strlen(p)-strlen(end_of_message);
+ char* dest = malloc(length);
+
+ memcpy(dest, &p[0], length);
+ dest[length] = 0;
+
+ fprintf(stderr, "%s %s\n", dest, filename);
+
+ free(dest);
+ }
+ else {
+ fprintf(stderr, "%s\n", e->bt_strings[i]);
+ }
+ }
} else
#endif
/* the externally visible API */
XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
-XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate =
- &__xbt_ex_terminate_default;
+XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
void xbt_ex_free(xbt_ex_t e)
int i;
free(e.msg);
- if (e.remote) {
- free(e.procname);
- free(e.file);
- free(e.func);
- free(e.host);
- }
if (e.bt_strings) {
for (i = 0; i < e.used; i++)
return "tracing error";
case io_error:
return "io error";
+ case vm_error:
+ return "vm error";
+
}
return "INVALID ERROR";
}
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 {
static void good_example(void)
{
- global_context_t *global_context = malloc(sizeof(global_context_t));
+ global_context_t *global_context = xbt_malloc(sizeof(global_context_t));
/* GOOD_EXAMPLE */
{ /*01 */