Initialize surf before the context module, so the later one can make use of the confi...

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index a4d3882..12829ad 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -84,6 +84,7 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_global->latency_limited_dict = xbt_dict_new();
 #endif
 
+    surf_init(argc, argv);      /* Initialize SURF structures */
     SIMIX_context_mod_init();
     SIMIX_create_maestro_process();
 
@@ -99,7 +100,6 @@ void SIMIX_global_init(int *argc, char **argv)
 
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
-    surf_init(argc, argv);      /* Initialize SURF structures */
   }
   if (!simix_timers) {
     simix_timers = xbt_heap_new(8, &free);
@@ -288,8 +288,8 @@ void SIMIX_display_process_status(void)
     return;
   }
 
-  smx_process_t process = NULL;
-  /*xbt_fifo_item_t item = NULL;
+  /*smx_process_t process = NULL;
+  xbt_fifo_item_t item = NULL;
   smx_action_t act;*/
   int nbprocess = xbt_swag_size(simix_global->process_list);