Fixed some issues in logs logic due to recent changes [Cristian]

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 3c45e55..c04067b 100644 (file)
--- 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)");
 
@@ -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);
 
@@ -63,13 +65,20 @@ void SIMIX_global_init(int *argc, char **argv)
       xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
     simix_global->process_list =
       xbt_swag_new(xbt_swag_offset(proc, process_hookup));
+    simix_global->process_to_destroy =
+      xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+
     simix_global->current_process = NULL;
+    simix_global->maestro_process = NULL;
     simix_global->registered_functions = xbt_dict_new();
 
     simix_global->create_process_function = NULL;
     simix_global->kill_process_function = NULL;
     simix_global->cleanup_process_function = SIMIX_process_cleanup;
 
+    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 */
@@ -202,10 +211,10 @@ void SIMIX_process_killall()
       SIMIX_process_kill(p);
   }
 
-  xbt_context_empty_trash();
+  SIMIX_process_empty_trash();
 
-  if (self) {
-    xbt_context_yield();
+  if (self != simix_global->maestro_process) {
+    __SIMIX_process_yield();
   }
 
   return;
@@ -214,25 +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));
 
+  /* Let's free maestro now */
+  SIMIX_context_free(simix_global->maestro_process->context);
+  free(simix_global->maestro_process);  
+
+  /* Finish context module and SURF */
+  SIMIX_context_mod_exit();
   surf_exit();
 
+  free(simix_global);
+  simix_global = NULL;
+
   return;
 }
 
@@ -273,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;
 
-  xbt_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;
-    xbt_context_schedule(process->context);
-    /*       fflush(NULL); */
-    simix_global->current_process = NULL;
+    DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+    __SIMIX_process_schedule(process);
   }
 
   {