X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a03bd071f7ec12cf9dd65b0e912fd3f84d29c880..1cde906ff21eb6a3dd34cce742b544e1ddcb8994:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 64336802d3..c04067bc0f 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -18,6 +18,7 @@ XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
 XBT_LOG_EXTERNAL_CATEGORY(simix_host);
 XBT_LOG_EXTERNAL_CATEGORY(simix_process);
 XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+XBT_LOG_EXTERNAL_CATEGORY(simix_context);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                 "Logging specific to SIMIX (kernel)");
 
@@ -45,7 +46,7 @@ static void _XBT_CALL inthandler(int ignored)
 void SIMIX_global_init(int *argc, char **argv)
 {
   s_smx_process_t proc;
-  
+
   if (!simix_global) {
     /* Connect our log channels: that must be done manually under windows */
     XBT_LOG_CONNECT(simix_action, simix);
@@ -55,6 +56,7 @@ void SIMIX_global_init(int *argc, char **argv)
     XBT_LOG_CONNECT(simix_kernel, simix);
     XBT_LOG_CONNECT(simix_process, simix);
     XBT_LOG_CONNECT(simix_synchro, simix);
+    XBT_LOG_CONNECT(simix_context, simix);
 
     simix_global = xbt_new0(s_SIMIX_Global_t, 1);
 
@@ -76,7 +78,7 @@ void SIMIX_global_init(int *argc, char **argv)
 
     SIMIX_context_mod_init();
     __SIMIX_create_maestro_process();
-    
+
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
     surf_init(argc, argv);      /* Initialize SURF structures */
@@ -209,10 +211,10 @@ void SIMIX_process_killall()
       SIMIX_process_kill(p);
   }
 
-  SIMIX_context_empty_trash();
+  SIMIX_process_empty_trash();
 
-  if (self) {
-    SIMIX_context_yield();
+  if (self != simix_global->maestro_process) {
+    __SIMIX_process_yield();
   }
 
   return;
@@ -221,34 +223,32 @@ void SIMIX_process_killall()
 /**
  * \brief Clean the SIMIX simulation
  *
- * This functions remove all memories needed to the SIMIX execution
+ * This functions remove the memory used by SIMIX
  */
 void SIMIX_clean(void)
 {
-  smx_process_t p = NULL;
-
-  while ((p = xbt_swag_extract(simix_global->process_list))) {
-    SIMIX_process_kill(p);
-  }
+  /* Kill everyone (except maestro) */
+  SIMIX_process_killall();
 
-  xbt_dict_free(&(simix_global->host));
+  /* Free the remaining data structures*/
   xbt_swag_free(simix_global->process_to_run);
+  xbt_swag_free(simix_global->process_to_destroy);
+  xbt_swag_free(simix_global->process_list);
+  simix_global->process_list = NULL;
   xbt_dict_free(&(simix_global->registered_functions));
-  free(simix_global);
-  simix_global = NULL;
+  xbt_dict_free(&(simix_global->host));
 
-  surf_exit();
+  /* Let's free maestro now */
+  SIMIX_context_free(simix_global->maestro_process->context);
+  free(simix_global->maestro_process);  
 
-  /*FIXME Remove maestro's smx_process from the process_list before calling
-    SIMIX_context_mod_exit() and delete it afterwards (it should be the last one) */
+  /* Finish context module and SURF */
   SIMIX_context_mod_exit();
-  xbt_swag_free(simix_global->process_list);
-  xbt_swag_free(simix_global->process_to_destroy);
+  surf_exit();
+
+  free(simix_global);
+  simix_global = NULL;
 
-  /* Let's free maestro */
-  SIMIX_context_free(simix_global->maestro_process);
-  free(simix_global->maestro_process);
-  
   return;
 }
 
@@ -289,18 +289,14 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   double elapsed_time = 0.0;
   static int state_modifications = 1;
 
-  SIMIX_context_empty_trash();
+  SIMIX_process_empty_trash();
   if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
     DEBUG0("**************************************************");
   }
 
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
-    DEBUG2("Scheduling %s on %s",
-           process->name, process->smx_host->name);
-    simix_global->current_process = process;
-    SIMIX_context_schedule(process);
-    /*       fflush(NULL); */
-    simix_global->current_process = NULL;
+    DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+    __SIMIX_process_schedule(process);
   }
 
   {