From d2782615cdbeb1ad4c5e994a4c681739927e3aff Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 2 Nov 2014 00:30:34 +0100
Subject: [PATCH] improve a bit the documentation of popping, and align code
 with doc

---
 doc/doxygen/inside_extending.doc  |  23 +--
 src/mc/mc_comm_determinism.c      |   2 +-
 src/mc/mc_global.c                |   6 +-
 src/mc/mc_liveness.c              |   2 +-
 src/mc/mc_safety.c                |   2 +-
 src/simix/simcalls.py             |   4 +-
 src/simix/smx_global.c            |   2 +-
 src/simix/smx_popping_bodies.c    | 246 +++++++++++++++---------------
 src/simix/smx_popping_generated.c |   2 +-
 src/simix/smx_smurf_private.h     |   2 +-
 10 files changed, 148 insertions(+), 143 deletions(-)

diff --git a/doc/doxygen/inside_extending.doc b/doc/doxygen/inside_extending.doc
index e4da841c1e..27d1acad8b 100644
--- a/doc/doxygen/inside_extending.doc
+++ b/doc/doxygen/inside_extending.doc
@@ -117,22 +117,27 @@ s_surf_model_description_t surf_plugin_description[] = {
 ~~~~
 
 \section simgrid_dev_guide_simcall How to add a new simcall?
-A simcall is used to go from user mode to kernel mode. The workflow of
-a simcall is the following:
+
+A simcall is used to go from user mode to kernel mode. There is some
+sort of popping dance involved, as we want to isolate the user
+contextes from their environment (so that they can run in parallel).
+
+The workflow of a simcall is the following:
 
 - `<ret> simcall_<name>(<args>)`
  - `simcall_BODY_<name>(<args>)`
-  - create the simcall
-  - `SIMIX_process_yield` if not maestro
+  - Initializes the simcall (store the arguments in position)
+  - If maestro, executes the simcall directly (and return)
+  - If not, call `SIMIX_process_yield` to give back the control to maestro
   - ========== KERNEL MODE ==========
-  - `SIMIX_simcall_enter`
+  - `SIMIX_simcall_handle` large switch (on simcall) doing for each:
    - `SIMIX_pre_<name>(simcall, <args>)`
    - `SIMIX_simcall_answer(simcall)`
 
-To simplify the simcall creation, we have made a python script that
-generate most of the code and give helpers for the remaining stuff.
-That script reads the simcall definitions from src/simix/simcalls.in 
-and generates the following files:
+To simplify the simcall creation, a python script generates most of
+the code and give helpers for the remaining stuff. That script reads
+the simcall definitions from src/simix/simcalls.in and generates the
+following files:
 
 - smx_popping_accessors.h:
   Helper functions to get and set simcall arguments and results
diff --git a/src/mc/mc_comm_determinism.c b/src/mc/mc_comm_determinism.c
index e409c12875..26bcadc2e1 100644
--- a/src/mc/mc_comm_determinism.c
+++ b/src/mc/mc_comm_determinism.c
@@ -356,7 +356,7 @@ void MC_modelcheck_comm_determinism(void)
       }
 
       /* Answer the request */
-      SIMIX_simcall_enter(req, value);    /* After this call req is no longer useful */
+      SIMIX_simcall_handle(req, value);    /* After this call req is no longer useful */
 
       MC_SET_MC_HEAP;
       current_pattern = !initial_global_state->initial_communications_pattern_done ? initial_communications_pattern : communications_pattern; 
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 0d4543dd6d..6b8d8b04af 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -349,7 +349,7 @@ void MC_wait_for_requests(void)
       xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
       req = &process->simcall;
       if (req->call != SIMCALL_NONE && !MC_request_is_visible(req))
-        SIMIX_simcall_enter(req, 0);
+        SIMIX_simcall_handle(req, 0);
     }
   }
 }
@@ -491,7 +491,7 @@ void MC_replay(xbt_fifo_t stack, int start)
         call = mc_get_call_type(req);
       }
 
-      SIMIX_simcall_enter(req, value);
+      SIMIX_simcall_handle(req, value);
 
       if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
         MC_SET_MC_HEAP;
@@ -586,7 +586,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
 
         }
 
-        SIMIX_simcall_enter(req, value);
+        SIMIX_simcall_handle(req, value);
         MC_wait_for_requests();
       }
 
diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index aa2c992a40..42d7c89d34 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -385,7 +385,7 @@ void MC_modelcheck_liveness()
           mc_stats->executed_transitions++;
 
           /* Answer the request */
-          SIMIX_simcall_enter(req, value);
+          SIMIX_simcall_handle(req, value);
 
           /* Wait for requests (schedules processes) */
           MC_wait_for_requests();
diff --git a/src/mc/mc_safety.c b/src/mc/mc_safety.c
index 2a1df9b471..486b320623 100644
--- a/src/mc/mc_safety.c
+++ b/src/mc/mc_safety.c
@@ -137,7 +137,7 @@ void MC_modelcheck_safety(void)
       }
 
       /* Answer the request */
-      SIMIX_simcall_enter(req, value);
+      SIMIX_simcall_handle(req, value);
 
       /* Wait for requests (schedules processes) */
       MC_wait_for_requests();
diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 7ebab19990..58840ce4e0 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -163,7 +163,7 @@ inline static %s simcall_BODY_%s(%s) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     %s
   }'''%(self.res.ret()
@@ -287,7 +287,7 @@ if __name__=='__main__':
   fd.write(' * \n')
   fd.write(' * This function is generated from src/simix/simcalls.in\n')
   fd.write(' */\n');
-  fd.write('void SIMIX_simcall_enter(smx_simcall_t simcall, int value) {\n');
+  fd.write('void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {\n');
   fd.write('  XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));\n');
   fd.write('  SIMCALL_SET_MC_VALUE(simcall, value);\n');
   fd.write('  if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)\n');
diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index b9dedde4c4..78643dc999 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -394,7 +394,7 @@ void SIMIX_run(void)
 
       xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
         if (process->simcall.call != SIMCALL_NONE) {
-          SIMIX_simcall_enter(&process->simcall, 0);
+          SIMIX_simcall_handle(&process->simcall, 0);
         }
       }
     }
diff --git a/src/simix/smx_popping_bodies.c b/src/simix/smx_popping_bodies.c
index 1c54dc3113..6c17039a4e 100644
--- a/src/simix/smx_popping_bodies.c
+++ b/src/simix/smx_popping_bodies.c
@@ -33,7 +33,7 @@ inline static smx_host_t simcall_BODY_host_get_by_name(const char* name) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -54,7 +54,7 @@ inline static const char* simcall_BODY_host_get_name(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.cc;
   }
@@ -75,7 +75,7 @@ inline static void simcall_BODY_host_on(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -96,7 +96,7 @@ inline static void simcall_BODY_host_off(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -117,7 +117,7 @@ inline static xbt_dict_t simcall_BODY_host_get_properties(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -138,7 +138,7 @@ inline static int simcall_BODY_host_get_core(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -159,7 +159,7 @@ inline static xbt_swag_t simcall_BODY_host_get_process_list(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -180,7 +180,7 @@ inline static double simcall_BODY_host_get_speed(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -201,7 +201,7 @@ inline static double simcall_BODY_host_get_available_speed(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -222,7 +222,7 @@ inline static int simcall_BODY_host_get_state(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -243,7 +243,7 @@ inline static double simcall_BODY_host_get_current_power_peak(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -265,7 +265,7 @@ inline static double simcall_BODY_host_get_power_peak_at(smx_host_t host, int ps
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -286,7 +286,7 @@ inline static int simcall_BODY_host_get_nb_pstates(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -308,7 +308,7 @@ inline static void simcall_BODY_host_set_power_peak_at(smx_host_t host, int psta
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -329,7 +329,7 @@ inline static double simcall_BODY_host_get_consumed_energy(smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -355,7 +355,7 @@ inline static smx_action_t simcall_BODY_host_execute(const char* name, smx_host_
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -382,7 +382,7 @@ inline static smx_action_t simcall_BODY_host_parallel_execute(const char* name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -403,7 +403,7 @@ inline static void simcall_BODY_host_execution_destroy(smx_action_t execution) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -424,7 +424,7 @@ inline static void simcall_BODY_host_execution_cancel(smx_action_t execution) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -445,7 +445,7 @@ inline static double simcall_BODY_host_execution_get_remains(smx_action_t execut
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -466,7 +466,7 @@ inline static int simcall_BODY_host_execution_get_state(smx_action_t execution)
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -488,7 +488,7 @@ inline static void simcall_BODY_host_execution_set_priority(smx_action_t executi
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -510,7 +510,7 @@ inline static void simcall_BODY_host_execution_set_bound(smx_action_t execution,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -533,7 +533,7 @@ inline static void simcall_BODY_host_execution_set_affinity(smx_action_t executi
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -554,7 +554,7 @@ inline static int simcall_BODY_host_execution_wait(smx_action_t execution) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -575,7 +575,7 @@ inline static xbt_dict_t simcall_BODY_host_get_mounted_storage_list(smx_host_t h
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -596,7 +596,7 @@ inline static xbt_dynar_t simcall_BODY_host_get_attached_storage_list(smx_host_t
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -618,7 +618,7 @@ inline static void simcall_BODY_host_get_params(smx_host_t ind_vm, ws_params_t p
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -640,7 +640,7 @@ inline static void simcall_BODY_host_set_params(smx_host_t ind_vm, ws_params_t p
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -662,7 +662,7 @@ inline static void* simcall_BODY_vm_create(const char* name, smx_host_t ind_pm)
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -683,7 +683,7 @@ inline static void simcall_BODY_vm_start(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -704,7 +704,7 @@ inline static int simcall_BODY_vm_get_state(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -726,7 +726,7 @@ inline static void simcall_BODY_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -747,7 +747,7 @@ inline static void* simcall_BODY_vm_get_pm(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -769,7 +769,7 @@ inline static void simcall_BODY_vm_set_bound(smx_host_t ind_vm, double bound) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -792,7 +792,7 @@ inline static void simcall_BODY_vm_set_affinity(smx_host_t ind_vm, smx_host_t in
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -813,7 +813,7 @@ inline static void simcall_BODY_vm_destroy(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -834,7 +834,7 @@ inline static void simcall_BODY_vm_suspend(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -855,7 +855,7 @@ inline static void simcall_BODY_vm_resume(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -876,7 +876,7 @@ inline static void simcall_BODY_vm_shutdown(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -897,7 +897,7 @@ inline static void simcall_BODY_vm_save(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -918,7 +918,7 @@ inline static void simcall_BODY_vm_restore(smx_host_t ind_vm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -948,7 +948,7 @@ inline static void simcall_BODY_process_create(smx_process_t* process, const cha
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -969,7 +969,7 @@ inline static void simcall_BODY_process_kill(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -990,7 +990,7 @@ inline static void simcall_BODY_process_killall(int reset_pid) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1011,7 +1011,7 @@ inline static void simcall_BODY_process_cleanup(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1033,7 +1033,7 @@ inline static void simcall_BODY_process_change_host(smx_process_t process, smx_h
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1054,7 +1054,7 @@ inline static void simcall_BODY_process_suspend(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1075,7 +1075,7 @@ inline static void simcall_BODY_process_resume(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1096,7 +1096,7 @@ inline static int simcall_BODY_process_count() {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1117,7 +1117,7 @@ inline static int simcall_BODY_process_get_PID(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1138,7 +1138,7 @@ inline static int simcall_BODY_process_get_PPID(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1159,7 +1159,7 @@ inline static void* simcall_BODY_process_get_data(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1181,7 +1181,7 @@ inline static void simcall_BODY_process_set_data(smx_process_t process, void* da
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1202,7 +1202,7 @@ inline static smx_host_t simcall_BODY_process_get_host(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1223,7 +1223,7 @@ inline static const char* simcall_BODY_process_get_name(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.cc;
   }
@@ -1244,7 +1244,7 @@ inline static int simcall_BODY_process_is_suspended(smx_process_t process) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1265,7 +1265,7 @@ inline static xbt_dict_t simcall_BODY_process_get_properties(smx_process_t proce
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1287,7 +1287,7 @@ inline static int simcall_BODY_process_join(smx_process_t process, double timeou
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1308,7 +1308,7 @@ inline static int simcall_BODY_process_sleep(double duration) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1331,7 +1331,7 @@ inline static void simcall_BODY_process_on_exit(smx_process_t process, int_f_pvo
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1353,7 +1353,7 @@ inline static void simcall_BODY_process_auto_restart_set(smx_process_t process,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1374,7 +1374,7 @@ inline static smx_process_t simcall_BODY_process_restart(smx_process_t process)
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1395,7 +1395,7 @@ inline static smx_rdv_t simcall_BODY_rdv_create(const char* name) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1416,7 +1416,7 @@ inline static void simcall_BODY_rdv_destroy(smx_rdv_t rdv) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1438,7 +1438,7 @@ inline static unsigned int simcall_BODY_rdv_comm_count_by_host(smx_rdv_t rdv, sm
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.ui;
   }
@@ -1459,7 +1459,7 @@ inline static smx_action_t simcall_BODY_rdv_get_head(smx_rdv_t rdv) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1481,7 +1481,7 @@ inline static void simcall_BODY_rdv_set_receiver(smx_rdv_t rdv, smx_process_t re
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1502,7 +1502,7 @@ inline static smx_process_t simcall_BODY_rdv_get_receiver(smx_rdv_t rdv) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1528,7 +1528,7 @@ inline static smx_action_t simcall_BODY_comm_iprobe(smx_rdv_t rdv, int type, int
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1558,7 +1558,7 @@ inline static void simcall_BODY_comm_send(smx_process_t src, smx_rdv_t rdv, doub
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1589,7 +1589,7 @@ inline static smx_action_t simcall_BODY_comm_isend(smx_process_t src, smx_rdv_t
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1617,7 +1617,7 @@ inline static void simcall_BODY_comm_recv(smx_rdv_t rdv, void* dst_buff, size_t*
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1644,7 +1644,7 @@ inline static smx_action_t simcall_BODY_comm_irecv(smx_rdv_t rdv, void* dst_buff
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1665,7 +1665,7 @@ inline static void simcall_BODY_comm_cancel(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1686,7 +1686,7 @@ inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1708,7 +1708,7 @@ inline static void simcall_BODY_comm_wait(smx_action_t comm, double timeout) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1729,7 +1729,7 @@ inline static int simcall_BODY_comm_test(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1750,7 +1750,7 @@ inline static int simcall_BODY_comm_testany(xbt_dynar_t comms) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1771,7 +1771,7 @@ inline static double simcall_BODY_comm_get_remains(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.d;
   }
@@ -1792,7 +1792,7 @@ inline static int simcall_BODY_comm_get_state(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1813,7 +1813,7 @@ inline static void* simcall_BODY_comm_get_src_data(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1834,7 +1834,7 @@ inline static void* simcall_BODY_comm_get_dst_data(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1855,7 +1855,7 @@ inline static smx_process_t simcall_BODY_comm_get_src_proc(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1876,7 +1876,7 @@ inline static smx_process_t simcall_BODY_comm_get_dst_proc(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1897,7 +1897,7 @@ inline static smx_mutex_t simcall_BODY_mutex_init() {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -1918,7 +1918,7 @@ inline static void simcall_BODY_mutex_destroy(smx_mutex_t mutex) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1939,7 +1939,7 @@ inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -1960,7 +1960,7 @@ inline static int simcall_BODY_mutex_trylock(smx_mutex_t mutex) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -1981,7 +1981,7 @@ inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2002,7 +2002,7 @@ inline static smx_cond_t simcall_BODY_cond_init() {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2023,7 +2023,7 @@ inline static void simcall_BODY_cond_destroy(smx_cond_t cond) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2044,7 +2044,7 @@ inline static void simcall_BODY_cond_signal(smx_cond_t cond) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2066,7 +2066,7 @@ inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2089,7 +2089,7 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2110,7 +2110,7 @@ inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2131,7 +2131,7 @@ inline static smx_sem_t simcall_BODY_sem_init(int capacity) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2152,7 +2152,7 @@ inline static void simcall_BODY_sem_destroy(smx_sem_t sem) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2173,7 +2173,7 @@ inline static void simcall_BODY_sem_release(smx_sem_t sem) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2194,7 +2194,7 @@ inline static int simcall_BODY_sem_would_block(smx_sem_t sem) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2215,7 +2215,7 @@ inline static void simcall_BODY_sem_acquire(smx_sem_t sem) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2237,7 +2237,7 @@ inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeou
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2258,7 +2258,7 @@ inline static int simcall_BODY_sem_get_capacity(smx_sem_t sem) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2281,7 +2281,7 @@ inline static sg_size_t simcall_BODY_file_read(smx_file_t fd, sg_size_t size, sm
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2304,7 +2304,7 @@ inline static sg_size_t simcall_BODY_file_write(smx_file_t fd, sg_size_t size, s
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2326,7 +2326,7 @@ inline static smx_file_t simcall_BODY_file_open(const char* fullpath, smx_host_t
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2348,7 +2348,7 @@ inline static int simcall_BODY_file_close(smx_file_t fd, smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2370,7 +2370,7 @@ inline static int simcall_BODY_file_unlink(smx_file_t fd, smx_host_t host) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2391,7 +2391,7 @@ inline static sg_size_t simcall_BODY_file_get_size(smx_file_t fd) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2412,7 +2412,7 @@ inline static sg_size_t simcall_BODY_file_tell(smx_file_t fd) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2435,7 +2435,7 @@ inline static int simcall_BODY_file_seek(smx_file_t fd, sg_offset_t offset, int
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2456,7 +2456,7 @@ inline static xbt_dynar_t simcall_BODY_file_get_info(smx_file_t fd) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2478,7 +2478,7 @@ inline static int simcall_BODY_file_move(smx_file_t fd, const char* fullpath) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2499,7 +2499,7 @@ inline static sg_size_t simcall_BODY_storage_get_free_size(smx_storage_t storage
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2520,7 +2520,7 @@ inline static sg_size_t simcall_BODY_storage_get_used_size(smx_storage_t name) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.sgsz;
   }
@@ -2541,7 +2541,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_properties(smx_storage_t stora
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2562,7 +2562,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage)
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2583,7 +2583,7 @@ inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2605,7 +2605,7 @@ inline static int simcall_BODY_comm_is_latency_bounded(smx_action_t comm) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2630,7 +2630,7 @@ inline static void simcall_BODY_set_category(smx_action_t action, const char* ca
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     
   }
@@ -2654,7 +2654,7 @@ inline static void* simcall_BODY_mc_snapshot() {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.dp;
   }
@@ -2676,7 +2676,7 @@ inline static int simcall_BODY_mc_compare_snapshots(void* s1, void* s2) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
@@ -2698,7 +2698,7 @@ inline static int simcall_BODY_mc_random(int min, int max) {
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
       SIMIX_process_yield(self);
     } else {
-      SIMIX_simcall_enter(&self->simcall, 0);
+      SIMIX_simcall_handle(&self->simcall, 0);
     }    
     return self->simcall.result.i;
   }
diff --git a/src/simix/smx_popping_generated.c b/src/simix/smx_popping_generated.c
index 4583b871a5..46f9bdb44a 100644
--- a/src/simix/smx_popping_generated.c
+++ b/src/simix/smx_popping_generated.c
@@ -161,7 +161,7 @@ const char* simcall_names[] = {
  * 
  * This function is generated from src/simix/simcalls.in
  */
-void SIMIX_simcall_enter(smx_simcall_t simcall, int value) {
+void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {
   XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));
   SIMCALL_SET_MC_VALUE(simcall, value);
   if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)
diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index b8640daa3c..76bc48a7fb 100644
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -66,7 +66,7 @@ typedef struct s_smx_simcall {
 /******************************** General *************************************/
 
 void SIMIX_simcall_answer(smx_simcall_t);
-void SIMIX_simcall_enter(smx_simcall_t, int);
+void SIMIX_simcall_handle(smx_simcall_t, int);
 void SIMIX_simcall_exit(smx_action_t);
 const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 //FIXME put it in a better place
-- 
2.20.1