Don't initialize the contextes manually, it will be done by xbt_init on need

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3230 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/global.c b/src/msg/global.c
index 9d4e7ec..44f01c1 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -46,7 +46,6 @@ void MSG_global_init(int *argc, char **argv)
      
     msg_global = xbt_new0(s_MSG_Global_t,1);
 
      
     msg_global = xbt_new0(s_MSG_Global_t,1);
 

-    xbt_context_init();

     msg_global->host = xbt_fifo_new();
     msg_global->process_to_run = xbt_fifo_new();
     msg_global->process_list = xbt_fifo_new();
     msg_global->host = xbt_fifo_new();
     msg_global->process_to_run = xbt_fifo_new();
     msg_global->process_list = xbt_fifo_new();


@@ -482,7 +481,6 @@ MSG_error_t MSG_clean(void)
   while((p=xbt_fifo_pop(msg_global->process_list))) {
     MSG_process_kill(p);
   }
   while((p=xbt_fifo_pop(msg_global->process_list))) {
     MSG_process_kill(p);
   }

-  xbt_context_exit();

 
   xbt_fifo_foreach(msg_global->host,i,h,m_host_t) {
     __MSG_host_destroy(h);
 
   xbt_fifo_foreach(msg_global->host,i,h,m_host_t) {
     __MSG_host_destroy(h);

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 7335b59..2b72da8 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -46,7 +46,6 @@ void SIMIX_global_init(int *argc, char **argv)
 
                simix_global = xbt_new0(s_SIMIX_Global_t,1);
 
 
                simix_global = xbt_new0(s_SIMIX_Global_t,1);
 

-               xbt_context_init();

                simix_global->host = xbt_fifo_new();
                simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,synchro_hookup));
                simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
                simix_global->host = xbt_fifo_new();
                simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,synchro_hookup));
                simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));


@@ -197,7 +196,6 @@ void SIMIX_clean(void)
   while((p=xbt_swag_extract(simix_global->process_list))) {
     SIMIX_process_kill(p);
   }
   while((p=xbt_swag_extract(simix_global->process_list))) {
     SIMIX_process_kill(p);
   }

-  xbt_context_exit();

 
   xbt_fifo_foreach(simix_global->host,i,h,smx_host_t) {
     __SIMIX_host_destroy(h);
 
   xbt_fifo_foreach(simix_global->host,i,h,smx_host_t) {
     __SIMIX_host_destroy(h);