Sanitize the XBT log chans, too. Arnaud did so for MSG+SURF, I did so for AMOK+GRAS...

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

diff --git a/src/xbt/context.c b/src/xbt/context.c
index e710657..6ea5172 100644 (file)
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -15,7 +15,7 @@
 #include "xbt/dynar.h"
 #include "gras_config.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(context, xbt, "Context");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ctx, xbt, "Context");
 
 #define VOIRP(expr) DEBUG1("  {" #expr " = %p }", expr)
 
@@ -172,9 +172,16 @@ static ex_ctx_t *__context_ex_ctx(void)
 }
 
 /* callback: termination */
-static void __context_ex_terminate(xbt_ex_t *e)
-{
-  __context_exit(current_context, e->value);
+static void __context_ex_terminate(xbt_ex_t *e) {
+  xbt_ex_display(e);
+
+  abort();
+   /* FIXME: there should be a configuration variable to choose this
+  if(current_context!=init_context) 
+    __context_exit(current_context, e->value);
+  else
+    abort();
+    */
 }
 
 /** \name Functions