Intermidiate step towards the new context mechanism [Cristian]

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 84d623f..8f79991 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -209,10 +209,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;
@@ -287,14 +287,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);
   }
 
   {