react correctly if an exception does not originates the current process

[simgrid.git] / src / xbt / ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 3f333ce..a543fb8 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -1,6 +1,8 @@
 /* ex - Exception Handling                                                  */
 
 /* 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/>           */
 /*  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/>           */


@@ -46,11 +48,9 @@
 #include "portable.h"           /* execinfo when available */
 #include "xbt/ex.h"
 #include "xbt/str.h"
 #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_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
 #include "xbt/ex_interface.h"
 
 #undef HAVE_BACKTRACE


@@ -77,7 +77,7 @@ xbt_running_ctx_t *__xbt_ex_ctx_default(void)
      real life and in simulation when using threads to implement the simulation
      processes (ie, with pthreads and on windows).
 
      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;
      in Java for now, but after the java overhaul, it will get cleaned out)
    */
   static xbt_running_ctx_t ctx = XBT_RUNNING_CTX_INITIALIZER;


@@ -106,7 +106,6 @@ void xbt_backtrace_display(xbt_ex_t * e)
 
   /* don't fool xbt_ex_free with uninitialized msg field */
   e->msg = NULL;
 
   /* don't fool xbt_ex_free with uninitialized msg field */
   e->msg = NULL;

-  e->remote = 0;

   xbt_ex_free(*e);
 #else
 
   xbt_ex_free(*e);
 #else
 


@@ -134,21 +133,20 @@ void xbt_backtrace_display_current(void)
 void xbt_ex_display(xbt_ex_t * e)
 {
   char *thrower = NULL;
 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",
 
   fprintf(stderr,
           "** 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_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);
 
           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
     xbt_ex_setup_backtrace(e);
 
 #ifdef HAVE_BACKTRACE


@@ -176,14 +174,12 @@ void xbt_ex_display(xbt_ex_t * e)
 void __xbt_ex_terminate_default(xbt_ex_t * e)
 {
   xbt_ex_display(e);
 void __xbt_ex_terminate_default(xbt_ex_t * e)
 {
   xbt_ex_display(e);

-
-  abort();
+  xbt_abort();

 }
 
 /* the externally visible API */
 XBT_EXPORT_NO_IMPORT(xbt_running_ctx_fetcher_t) __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
 }
 
 /* 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)
 
 
 void xbt_ex_free(xbt_ex_t e)


@@ -191,12 +187,6 @@ void xbt_ex_free(xbt_ex_t e)
   int i;
 
   free(e.msg);
   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++)
 
   if (e.bt_strings) {
     for (i = 0; i < e.used; i++)


@@ -236,6 +226,9 @@ const char *xbt_ex_catname(xbt_errcat_t cat)
     return "tracing error";
   case io_error:
     return "io error";
     return "tracing error";
   case io_error:
     return "io error";

+  case vm_error:
+    return "vm error";
+

   }
   return "INVALID ERROR";
 }
   }
   return "INVALID ERROR";
 }


@@ -320,7 +313,8 @@ XBT_TEST_UNIT("variables", test_variables, "variable value preservation")
   xbt_ex_t ex;
   int r1;
   int _XBT_GNUC_UNUSED r2;
   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 {
 
   r1 = r2 = v1 = v2 = 1234;
   TRY {


@@ -422,7 +416,7 @@ typedef struct {
 
 static void good_example(void)
 {
 
 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 */
 
   /* GOOD_EXAMPLE */
   {                             /*01 */