First step into moving the context subsystem into simix. Still segfaults because...

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 267302b..6433680 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);
@@ -63,13 +63,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 */
@@ -89,34 +96,31 @@ void SIMIX_display_process_status(void)
   INFO0
     ("Legend of the following listing: \"<process> on <host>: <status>.\"");
   xbt_swag_foreach(process, simix_global->process_list) {
-    smx_simdata_process_t p_simdata =
-      (smx_simdata_process_t) process->simdata;
-    // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
     char *who, *who2;
 
     asprintf(&who, "%s on %s: %s",
              process->name,
-             p_simdata->smx_host->name,
-             (process->simdata->blocked) ? "[BLOCKED] "
-             : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
+             process->smx_host->name,
+             (process->blocked) ? "[BLOCKED] "
+             : ((process->suspended) ? "[SUSPENDED] " : ""));
 
-    if (p_simdata->mutex) {
+    if (process->mutex) {
       who2 =
         bprintf("%s Blocked on mutex %p", who,
                 (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-                p_simdata->mutex : (void *) 0xdead);
+                process->mutex : (void *) 0xdead);
       free(who);
       who = who2;
-    } else if (p_simdata->cond) {
+    } else if (process->cond) {
       who2 =
         bprintf
         ("%s Blocked on condition %p; Waiting for the following actions:",
          who,
          (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
-         p_simdata->cond : (void *) 0xdead);
+         process->cond : (void *) 0xdead);
       free(who);
       who = who2;
-      xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
+      xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
         who2 =
           bprintf("%s '%s'(%p)", who, act->name,
                   (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
@@ -165,7 +169,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
         xbt_swag_foreach(process, cond->sleeping) {
           DEBUG2("\t preparing to wake up %s on %s",
-                 process->name, process->simdata->smx_host->name);
+                 process->name, process->smx_host->name);
         }
         SIMIX_cond_broadcast(cond);
         /* remove conditional from action */
@@ -180,7 +184,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
         xbt_swag_foreach(process, cond->sleeping) {
           DEBUG2("\t preparing to wake up %s on %s",
-                 process->name, process->simdata->smx_host->name);
+                 process->name, process->smx_host->name);
         }
         SIMIX_cond_broadcast(cond);
         /* remove conditional from action */
@@ -205,10 +209,10 @@ void SIMIX_process_killall()
       SIMIX_process_kill(p);
   }
 
-  xbt_context_empty_trash();
+  SIMIX_context_empty_trash();
 
   if (self) {
-    xbt_context_yield();
+    SIMIX_context_yield();
   }
 
   return;
@@ -229,13 +233,22 @@ void SIMIX_clean(void)
 
   xbt_dict_free(&(simix_global->host));
   xbt_swag_free(simix_global->process_to_run);
-  xbt_swag_free(simix_global->process_list);
   xbt_dict_free(&(simix_global->registered_functions));
   free(simix_global);
   simix_global = NULL;
 
   surf_exit();
 
+  /*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) */
+  SIMIX_context_mod_exit();
+  xbt_swag_free(simix_global->process_list);
+  xbt_swag_free(simix_global->process_to_destroy);
+
+  /* Let's free maestro */
+  SIMIX_context_free(simix_global->maestro_process);
+  free(simix_global->maestro_process);
+  
   return;
 }
 
@@ -276,16 +289,16 @@ 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_context_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->simdata->smx_host->name);
+           process->name, process->smx_host->name);
     simix_global->current_process = process;
-    xbt_context_schedule(process->simdata->context);
+    SIMIX_context_schedule(process);
     /*       fflush(NULL); */
     simix_global->current_process = NULL;
   }
@@ -331,7 +344,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
       if (fun == SIMIX_process_kill) {
         process = arg;
         DEBUG2("Killing %s on %s", process->name,
-               process->simdata->smx_host->name);
+               process->smx_host->name);
         SIMIX_process_kill(process);
       }
     }