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 7c7d9c1..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)");
 
@@ -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_global->maestro_process) {
-    SIMIX_context_yield();
+    __SIMIX_process_yield();
   }
 
   return;
@@ -227,9 +229,7 @@ void SIMIX_clean(void)
 {
   /* Kill everyone (except maestro) */
   SIMIX_process_killall();
-  
-  simix_config_finalize();
-  
+
   /* Free the remaining data structures*/
   xbt_swag_free(simix_global->process_to_run);
   xbt_swag_free(simix_global->process_to_destroy);
@@ -237,18 +237,18 @@ void SIMIX_clean(void)
   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);
+  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;
 }
 
@@ -289,14 +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_context_schedule(process);
+    __SIMIX_process_schedule(process);
   }
 
   {