Destroy the context of the maestro after the call of the function xbt_context_empty_t...

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

diff --git a/src/xbt/xbt_context.c b/src/xbt/xbt_context.c
index 418b125..f3c9ecd 100644 (file)
--- a/src/xbt/xbt_context.c
+++ b/src/xbt/xbt_context.c
@@ -13,21 +13,17 @@
 #include "xbt_context_factory.h"\r
 \r
 /* the context associated with the current process                             */\r
-static xbt_context_t \r
-current_context = NULL;\r
+xbt_context_t current_context = NULL;\r
 \r
 /* the context associated with the maestro                                             */\r
-static xbt_context_t \r
-maestro_context = NULL;\r
+xbt_context_t  maestro_context = NULL;\r
 \r
 \r
 /* this list contains the contexts to destroy                                  */\r
-static xbt_swag_t \r
-context_to_destroy = NULL;\r
+xbt_swag_t context_to_destroy = NULL;\r
 \r
 /* this list contains the contexts in use                                              */\r
-static xbt_swag_t \r
-context_living = NULL;\r
+xbt_swag_t context_living = NULL;\r
 \r
 /* the context factory used to create the appropriate context  \r
  * each context implementation define its own context factory\r
@@ -42,18 +38,6 @@ context_living = NULL;
 static xbt_context_factory_t\r
 context_factory = NULL;\r
 \r
-/* java implementation of the context */\r
-#include "xbt_jcontext.c"\r
-\r
-#ifdef CONTEXT_THREADS\r
-/* use the native thread implementation of the context */\r
-#include "xbt_thread_context.c"\r
-#elif !defined(WIN32)\r
-/* use the ucontext    based context           */\r
-#  include "xbt_ucontext.c" \r
-#endif \r
-\r
-\r
 /**\r
  * This function is call by the xbt_init() function to initialize the context module.\r
  */\r
@@ -116,9 +100,6 @@ xbt_context_mod_exit(void)
                /* remove the context of the scheduler from the list of the contexts in use */\r
                xbt_swag_remove(maestro_context, context_living);\r
                \r
-               free(maestro_context);\r
-               maestro_context = current_context = NULL;\r
-               \r
                /*  \r
                 * kill all the contexts in use :\r
                 * the killed contexts are added in the list of the contexts to destroy\r
@@ -130,6 +111,9 @@ xbt_context_mod_exit(void)
                /* destroy all contexts in the list of contexts to destroy */\r
                xbt_context_empty_trash();\r
                \r
+               free(maestro_context);\r
+               maestro_context = current_context = NULL;\r
+               \r
                /* destroy the lists */\r
                xbt_swag_free(context_to_destroy);\r
                xbt_swag_free(context_living);\r