Fixed the pthread context implementation, now it compiles and runs

[simgrid.git] / src / simix / smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 9d2059a..642a698 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -45,7 +45,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);
@@ -76,7 +76,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,7 +209,7 @@ void SIMIX_process_killall()
       SIMIX_process_kill(p);
   }
 
-  SIMIX_context_empty_trash();
+  SIMIX_process_empty_trash();
 
   if (self != simix_global->maestro_process) {
     SIMIX_context_yield();
@@ -228,29 +228,25 @@ void SIMIX_clean(void)
   /* Kill everyone (except maestro) */
   SIMIX_process_killall();
 
-  /* Destroy the hosts list (and the hosts) */
-  xbt_dict_free(&(simix_global->host));
-  
-  simix_config_finalize();
-  
   /* 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));
+  xbt_dict_free(&(simix_global->host));
 
   /* Let's free maestro now */
   SIMIX_context_free(simix_global->maestro_process);
-  free(simix_global->maestro_process);  
+  free(simix_global->maestro_process);
 
   /* Finish context module and SURF */
   SIMIX_context_mod_exit();
   surf_exit();
-  
+
   free(simix_global);
   simix_global = NULL;
-  
+
   return;
 }
 
@@ -291,7 +287,7 @@ 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("**************************************************");
   }