Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
improve the doc of MSG_host_on() and friends
[simgrid.git] / src / simix / popping_bodies.c
index 6c17039..0f233fe 100644 (file)
  */
 
 #include "smx_private.h"
-#include "mc/mc_interface.h"
+#include "mc/mc_forward.h"
 #include "xbt/ex.h"
   
 inline static smx_host_t simcall_BODY_host_get_by_name(const char* name) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_by_name(&self->simcall, name);
+    if (0) SIMIX_host_get_by_name(name);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_BY_NAME;
@@ -42,7 +42,7 @@ inline static const char* simcall_BODY_host_get_name(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_name(&self->simcall, host);
+    if (0) SIMIX_host_get_name(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_NAME;
@@ -63,7 +63,7 @@ inline static void simcall_BODY_host_on(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_on(&self->simcall, host);
+    if (0) SIMIX_host_on(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_ON;
@@ -84,7 +84,7 @@ inline static void simcall_BODY_host_off(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_off(&self->simcall, host);
+    if (0) simcall_HANDLER_host_off(&self->simcall, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_OFF;
@@ -105,7 +105,7 @@ inline static xbt_dict_t simcall_BODY_host_get_properties(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_properties(&self->simcall, host);
+    if (0) SIMIX_host_get_properties(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_PROPERTIES;
@@ -126,7 +126,7 @@ inline static int simcall_BODY_host_get_core(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_core(&self->simcall, host);
+    if (0) SIMIX_host_get_core(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_CORE;
@@ -147,7 +147,7 @@ inline static xbt_swag_t simcall_BODY_host_get_process_list(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_process_list(&self->simcall, host);
+    if (0) SIMIX_host_get_process_list(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_PROCESS_LIST;
@@ -168,7 +168,7 @@ inline static double simcall_BODY_host_get_speed(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_speed(&self->simcall, host);
+    if (0) SIMIX_host_get_speed(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_SPEED;
@@ -189,7 +189,7 @@ inline static double simcall_BODY_host_get_available_speed(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_available_speed(&self->simcall, host);
+    if (0) SIMIX_host_get_available_speed(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_AVAILABLE_SPEED;
@@ -210,7 +210,7 @@ inline static int simcall_BODY_host_get_state(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_state(&self->simcall, host);
+    if (0) SIMIX_host_get_state(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_STATE;
@@ -231,7 +231,7 @@ inline static double simcall_BODY_host_get_current_power_peak(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_current_power_peak(&self->simcall, host);
+    if (0) SIMIX_host_get_current_power_peak(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_CURRENT_POWER_PEAK;
@@ -252,7 +252,7 @@ inline static double simcall_BODY_host_get_power_peak_at(smx_host_t host, int ps
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_power_peak_at(&self->simcall, host, pstate_index);
+    if (0) SIMIX_host_get_power_peak_at(host, pstate_index);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_POWER_PEAK_AT;
@@ -274,7 +274,7 @@ inline static int simcall_BODY_host_get_nb_pstates(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_nb_pstates(&self->simcall, host);
+    if (0) SIMIX_host_get_nb_pstates(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_NB_PSTATES;
@@ -291,14 +291,14 @@ inline static int simcall_BODY_host_get_nb_pstates(smx_host_t host) {
     return self->simcall.result.i;
   }
   
-inline static void simcall_BODY_host_set_power_peak_at(smx_host_t host, int pstate_index) {
+inline static void simcall_BODY_host_set_pstate(smx_host_t host, int pstate_index) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_set_power_peak_at(&self->simcall, host, pstate_index);
+    if (0) SIMIX_host_set_pstate(host, pstate_index);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
-    self->simcall.call = SIMCALL_HOST_SET_POWER_PEAK_AT;
+    self->simcall.call = SIMCALL_HOST_SET_PSTATE;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].dp = (void*) host;
@@ -313,11 +313,32 @@ inline static void simcall_BODY_host_set_power_peak_at(smx_host_t host, int psta
     
   }
   
+inline static int simcall_BODY_host_get_pstate(smx_host_t host) {
+    smx_process_t self = SIMIX_process_self();
+
+    /* Go to that function to follow the code flow through the simcall barrier */
+    if (0) SIMIX_host_get_pstate(host);
+    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
+
+    self->simcall.call = SIMCALL_HOST_GET_PSTATE;
+    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
+    memset(self->simcall.args, 0, sizeof(self->simcall.args));
+    self->simcall.args[0].dp = (void*) host;
+    if (self != simix_global->maestro_process) {
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
+      SIMIX_process_yield(self);
+    } else {
+      SIMIX_simcall_handle(&self->simcall, 0);
+    }    
+    return self->simcall.result.i;
+  }
+  
 inline static double simcall_BODY_host_get_consumed_energy(smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_consumed_energy(&self->simcall, host);
+    if (0) SIMIX_host_get_consumed_energy(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_CONSUMED_ENERGY;
@@ -334,11 +355,11 @@ inline static double simcall_BODY_host_get_consumed_energy(smx_host_t host) {
     return self->simcall.result.d;
   }
   
-inline static smx_action_t simcall_BODY_host_execute(const char* name, smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask) {
+inline static smx_synchro_t simcall_BODY_host_execute(const char* name, smx_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execute(&self->simcall, name, host, computation_amount, priority, bound, affinity_mask);
+    if (0) SIMIX_host_execute(name, host, flops_amount, priority, bound, affinity_mask);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTE;
@@ -346,7 +367,7 @@ inline static smx_action_t simcall_BODY_host_execute(const char* name, smx_host_
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
     self->simcall.args[0].cc = (const char*) name;
     self->simcall.args[1].dp = (void*) host;
-    self->simcall.args[2].d = (double) computation_amount;
+    self->simcall.args[2].d = (double) flops_amount;
     self->simcall.args[3].d = (double) priority;
     self->simcall.args[4].d = (double) bound;
     self->simcall.args[5].ul = (unsigned long) affinity_mask;
@@ -360,11 +381,11 @@ inline static smx_action_t simcall_BODY_host_execute(const char* name, smx_host_
     return self->simcall.result.dp;
   }
   
-inline static smx_action_t simcall_BODY_host_parallel_execute(const char* name, int host_nb, smx_host_t* host_list, double* computation_amount, double* communication_amount, double amount, double rate) {
+inline static smx_synchro_t simcall_BODY_host_parallel_execute(const char* name, int host_nb, smx_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_parallel_execute(&self->simcall, name, host_nb, host_list, computation_amount, communication_amount, amount, rate);
+    if (0) SIMIX_host_parallel_execute(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_PARALLEL_EXECUTE;
@@ -373,8 +394,8 @@ inline static smx_action_t simcall_BODY_host_parallel_execute(const char* name,
     self->simcall.args[0].cc = (const char*) name;
     self->simcall.args[1].i = (int) host_nb;
     self->simcall.args[2].dp = (void*) host_list;
-    self->simcall.args[3].dp = (void*) computation_amount;
-    self->simcall.args[4].dp = (void*) communication_amount;
+    self->simcall.args[3].dp = (void*) flops_amount;
+    self->simcall.args[4].dp = (void*) bytes_amount;
     self->simcall.args[5].d = (double) amount;
     self->simcall.args[6].d = (double) rate;
     if (self != simix_global->maestro_process) {
@@ -387,11 +408,11 @@ inline static smx_action_t simcall_BODY_host_parallel_execute(const char* name,
     return self->simcall.result.dp;
   }
   
-inline static void simcall_BODY_host_execution_destroy(smx_action_t execution) {
+inline static void simcall_BODY_host_execution_destroy(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_destroy(&self->simcall, execution);
+    if (0) SIMIX_host_execution_destroy(execution);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_DESTROY;
@@ -408,11 +429,11 @@ inline static void simcall_BODY_host_execution_destroy(smx_action_t execution) {
     
   }
   
-inline static void simcall_BODY_host_execution_cancel(smx_action_t execution) {
+inline static void simcall_BODY_host_execution_cancel(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_cancel(&self->simcall, execution);
+    if (0) SIMIX_host_execution_cancel(execution);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_CANCEL;
@@ -429,11 +450,11 @@ inline static void simcall_BODY_host_execution_cancel(smx_action_t execution) {
     
   }
   
-inline static double simcall_BODY_host_execution_get_remains(smx_action_t execution) {
+inline static double simcall_BODY_host_execution_get_remains(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_get_remains(&self->simcall, execution);
+    if (0) SIMIX_host_execution_get_remains(execution);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_GET_REMAINS;
@@ -450,11 +471,11 @@ inline static double simcall_BODY_host_execution_get_remains(smx_action_t execut
     return self->simcall.result.d;
   }
   
-inline static int simcall_BODY_host_execution_get_state(smx_action_t execution) {
+inline static e_smx_state_t simcall_BODY_host_execution_get_state(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_get_state(&self->simcall, execution);
+    if (0) SIMIX_host_execution_get_state(execution);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_GET_STATE;
@@ -471,11 +492,11 @@ inline static int simcall_BODY_host_execution_get_state(smx_action_t execution)
     return self->simcall.result.i;
   }
   
-inline static void simcall_BODY_host_execution_set_priority(smx_action_t execution, double priority) {
+inline static void simcall_BODY_host_execution_set_priority(smx_synchro_t execution, double priority) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_set_priority(&self->simcall, execution, priority);
+    if (0) SIMIX_host_execution_set_priority(execution, priority);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_SET_PRIORITY;
@@ -493,11 +514,11 @@ inline static void simcall_BODY_host_execution_set_priority(smx_action_t executi
     
   }
   
-inline static void simcall_BODY_host_execution_set_bound(smx_action_t execution, double bound) {
+inline static void simcall_BODY_host_execution_set_bound(smx_synchro_t execution, double bound) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_set_bound(&self->simcall, execution, bound);
+    if (0) SIMIX_host_execution_set_bound(execution, bound);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_SET_BOUND;
@@ -515,11 +536,11 @@ inline static void simcall_BODY_host_execution_set_bound(smx_action_t execution,
     
   }
   
-inline static void simcall_BODY_host_execution_set_affinity(smx_action_t execution, smx_host_t ws, unsigned long mask) {
+inline static void simcall_BODY_host_execution_set_affinity(smx_synchro_t execution, smx_host_t ws, unsigned long mask) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_set_affinity(&self->simcall, execution, ws, mask);
+    if (0) SIMIX_host_execution_set_affinity(execution, ws, mask);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_SET_AFFINITY;
@@ -538,11 +559,11 @@ inline static void simcall_BODY_host_execution_set_affinity(smx_action_t executi
     
   }
   
-inline static int simcall_BODY_host_execution_wait(smx_action_t execution) {
+inline static int simcall_BODY_host_execution_wait(smx_synchro_t execution) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_execution_wait(&self->simcall, execution);
+    if (0) simcall_HANDLER_host_execution_wait(&self->simcall, execution);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_EXECUTION_WAIT;
@@ -563,7 +584,7 @@ inline static xbt_dict_t simcall_BODY_host_get_mounted_storage_list(smx_host_t h
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_mounted_storage_list(&self->simcall, host);
+    if (0) SIMIX_host_get_mounted_storage_list(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_MOUNTED_STORAGE_LIST;
@@ -584,7 +605,7 @@ inline static xbt_dynar_t simcall_BODY_host_get_attached_storage_list(smx_host_t
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_attached_storage_list(&self->simcall, host);
+    if (0) SIMIX_host_get_attached_storage_list(host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_ATTACHED_STORAGE_LIST;
@@ -605,7 +626,7 @@ inline static void simcall_BODY_host_get_params(smx_host_t ind_vm, ws_params_t p
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_get_params(&self->simcall, ind_vm, params);
+    if (0) SIMIX_host_get_params(ind_vm, params);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_GET_PARAMS;
@@ -627,7 +648,7 @@ inline static void simcall_BODY_host_set_params(smx_host_t ind_vm, ws_params_t p
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_host_set_params(&self->simcall, ind_vm, params);
+    if (0) SIMIX_host_set_params(ind_vm, params);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_HOST_SET_PARAMS;
@@ -645,11 +666,11 @@ inline static void simcall_BODY_host_set_params(smx_host_t ind_vm, ws_params_t p
     
   }
   
-inline static void* simcall_BODY_vm_create(const char* name, smx_host_t ind_pm) {
+inline static smx_host_t simcall_BODY_vm_create(const char* name, smx_host_t ind_pm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_create(&self->simcall, name, ind_pm);
+    if (0) SIMIX_vm_create(name, ind_pm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_CREATE;
@@ -671,7 +692,7 @@ inline static void simcall_BODY_vm_start(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_start(&self->simcall, ind_vm);
+    if (0) SIMIX_vm_start(ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_START;
@@ -692,7 +713,7 @@ inline static int simcall_BODY_vm_get_state(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_get_state(&self->simcall, ind_vm);
+    if (0) SIMIX_vm_get_state(ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_GET_STATE;
@@ -713,7 +734,7 @@ inline static void simcall_BODY_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_migrate(&self->simcall, ind_vm, ind_dst_pm);
+    if (0) SIMIX_vm_migrate(ind_vm, ind_dst_pm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_MIGRATE;
@@ -735,7 +756,7 @@ inline static void* simcall_BODY_vm_get_pm(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_get_pm(&self->simcall, ind_vm);
+    if (0) SIMIX_vm_get_pm(ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_GET_PM;
@@ -756,7 +777,7 @@ inline static void simcall_BODY_vm_set_bound(smx_host_t ind_vm, double bound) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_set_bound(&self->simcall, ind_vm, bound);
+    if (0) SIMIX_vm_set_bound(ind_vm, bound);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_SET_BOUND;
@@ -778,7 +799,7 @@ inline static void simcall_BODY_vm_set_affinity(smx_host_t ind_vm, smx_host_t in
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_set_affinity(&self->simcall, ind_vm, ind_pm, mask);
+    if (0) SIMIX_vm_set_affinity(ind_vm, ind_pm, mask);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_SET_AFFINITY;
@@ -801,7 +822,7 @@ inline static void simcall_BODY_vm_destroy(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_destroy(&self->simcall, ind_vm);
+    if (0) SIMIX_vm_destroy(ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_DESTROY;
@@ -822,7 +843,7 @@ inline static void simcall_BODY_vm_suspend(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_suspend(&self->simcall, ind_vm);
+    if (0) simcall_HANDLER_vm_suspend(&self->simcall, ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_SUSPEND;
@@ -843,7 +864,7 @@ inline static void simcall_BODY_vm_resume(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_resume(&self->simcall, ind_vm);
+    if (0) simcall_HANDLER_vm_resume(&self->simcall, ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_RESUME;
@@ -864,7 +885,7 @@ inline static void simcall_BODY_vm_shutdown(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_shutdown(&self->simcall, ind_vm);
+    if (0) simcall_HANDLER_vm_shutdown(&self->simcall, ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_SHUTDOWN;
@@ -885,7 +906,7 @@ inline static void simcall_BODY_vm_save(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_save(&self->simcall, ind_vm);
+    if (0) simcall_HANDLER_vm_save(&self->simcall, ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_SAVE;
@@ -906,7 +927,7 @@ inline static void simcall_BODY_vm_restore(smx_host_t ind_vm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_vm_restore(&self->simcall, ind_vm);
+    if (0) simcall_HANDLER_vm_restore(&self->simcall, ind_vm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_VM_RESTORE;
@@ -923,11 +944,34 @@ inline static void simcall_BODY_vm_restore(smx_host_t ind_vm) {
     
   }
   
+inline static void simcall_BODY_vm_migratefrom_resumeto(smx_host_t vm, smx_host_t src_pm, smx_host_t dst_pm) {
+    smx_process_t self = SIMIX_process_self();
+
+    /* Go to that function to follow the code flow through the simcall barrier */
+    if (0) SIMIX_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
+    /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
+
+    self->simcall.call = SIMCALL_VM_MIGRATEFROM_RESUMETO;
+    memset(&self->simcall.result, 0, sizeof(self->simcall.result));
+    memset(self->simcall.args, 0, sizeof(self->simcall.args));
+    self->simcall.args[0].dp = (void*) vm;
+    self->simcall.args[1].dp = (void*) src_pm;
+    self->simcall.args[2].dp = (void*) dst_pm;
+    if (self != simix_global->maestro_process) {
+      XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
+                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
+      SIMIX_process_yield(self);
+    } else {
+      SIMIX_simcall_handle(&self->simcall, 0);
+    }    
+    
+  }
+  
 inline static void simcall_BODY_process_create(smx_process_t* process, const char* name, xbt_main_func_t code, void* data, const char* hostname, double kill_time, int argc, char** argv, xbt_dict_t properties, int auto_restart) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_create(&self->simcall, process, name, code, data, hostname, kill_time, argc, argv, properties, auto_restart);
+    if (0) simcall_HANDLER_process_create(&self->simcall, process, name, code, data, hostname, kill_time, argc, argv, properties, auto_restart);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_CREATE;
@@ -957,7 +1001,7 @@ inline static void simcall_BODY_process_kill(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_kill(&self->simcall, process);
+    if (0) simcall_HANDLER_process_kill(&self->simcall, process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_KILL;
@@ -978,7 +1022,7 @@ inline static void simcall_BODY_process_killall(int reset_pid) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_killall(&self->simcall, reset_pid);
+    if (0) simcall_HANDLER_process_killall(&self->simcall, reset_pid);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_KILLALL;
@@ -999,7 +1043,7 @@ inline static void simcall_BODY_process_cleanup(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_cleanup(&self->simcall, process);
+    if (0) SIMIX_process_cleanup(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_CLEANUP;
@@ -1020,7 +1064,7 @@ inline static void simcall_BODY_process_change_host(smx_process_t process, smx_h
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_change_host(&self->simcall, process, dest);
+    if (0) simcall_HANDLER_process_change_host(&self->simcall, process, dest);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_CHANGE_HOST;
@@ -1042,7 +1086,7 @@ inline static void simcall_BODY_process_suspend(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_suspend(&self->simcall, process);
+    if (0) simcall_HANDLER_process_suspend(&self->simcall, process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_SUSPEND;
@@ -1063,7 +1107,7 @@ inline static void simcall_BODY_process_resume(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_resume(&self->simcall, process);
+    if (0) simcall_HANDLER_process_resume(&self->simcall, process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_RESUME;
@@ -1084,7 +1128,7 @@ inline static int simcall_BODY_process_count() {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_count(&self->simcall);
+    if (0) SIMIX_process_count();
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_COUNT;
@@ -1105,7 +1149,7 @@ inline static int simcall_BODY_process_get_PID(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_PID(&self->simcall, process);
+    if (0) SIMIX_process_get_PID(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_PID;
@@ -1126,7 +1170,7 @@ inline static int simcall_BODY_process_get_PPID(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_PPID(&self->simcall, process);
+    if (0) SIMIX_process_get_PPID(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_PPID;
@@ -1147,7 +1191,7 @@ inline static void* simcall_BODY_process_get_data(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_data(&self->simcall, process);
+    if (0) SIMIX_process_get_data(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_DATA;
@@ -1168,7 +1212,7 @@ inline static void simcall_BODY_process_set_data(smx_process_t process, void* da
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_set_data(&self->simcall, process, data);
+    if (0) SIMIX_process_set_data(process, data);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_SET_DATA;
@@ -1190,7 +1234,7 @@ inline static smx_host_t simcall_BODY_process_get_host(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_host(&self->simcall, process);
+    if (0) SIMIX_process_get_host(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_HOST;
@@ -1211,7 +1255,7 @@ inline static const char* simcall_BODY_process_get_name(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_name(&self->simcall, process);
+    if (0) SIMIX_process_get_name(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_NAME;
@@ -1232,7 +1276,7 @@ inline static int simcall_BODY_process_is_suspended(smx_process_t process) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_is_suspended(&self->simcall, process);
+    if (0) SIMIX_process_is_suspended(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_IS_SUSPENDED;
@@ -1253,7 +1297,7 @@ inline static xbt_dict_t simcall_BODY_process_get_properties(smx_process_t proce
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_get_properties(&self->simcall, process);
+    if (0) SIMIX_process_get_properties(process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_GET_PROPERTIES;
@@ -1274,7 +1318,7 @@ inline static int simcall_BODY_process_join(smx_process_t process, double timeou
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_join(&self->simcall, process, timeout);
+    if (0) simcall_HANDLER_process_join(&self->simcall, process, timeout);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_JOIN;
@@ -1296,7 +1340,7 @@ inline static int simcall_BODY_process_sleep(double duration) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_sleep(&self->simcall, duration);
+    if (0) simcall_HANDLER_process_sleep(&self->simcall, duration);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_SLEEP;
@@ -1317,7 +1361,7 @@ inline static void simcall_BODY_process_on_exit(smx_process_t process, int_f_pvo
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_on_exit(&self->simcall, process, fun, data);
+    if (0) SIMIX_process_on_exit(process, fun, data);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_ON_EXIT;
@@ -1340,7 +1384,7 @@ inline static void simcall_BODY_process_auto_restart_set(smx_process_t process,
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_auto_restart_set(&self->simcall, process, auto_restart);
+    if (0) SIMIX_process_auto_restart_set(process, auto_restart);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_AUTO_RESTART_SET;
@@ -1362,7 +1406,7 @@ inline static smx_process_t simcall_BODY_process_restart(smx_process_t process)
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_process_restart(&self->simcall, process);
+    if (0) simcall_HANDLER_process_restart(&self->simcall, process);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_PROCESS_RESTART;
@@ -1383,7 +1427,7 @@ inline static smx_rdv_t simcall_BODY_rdv_create(const char* name) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_create(&self->simcall, name);
+    if (0) SIMIX_rdv_create(name);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_CREATE;
@@ -1404,7 +1448,7 @@ inline static void simcall_BODY_rdv_destroy(smx_rdv_t rdv) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_destroy(&self->simcall, rdv);
+    if (0) SIMIX_rdv_destroy(rdv);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_DESTROY;
@@ -1425,7 +1469,7 @@ inline static unsigned int simcall_BODY_rdv_comm_count_by_host(smx_rdv_t rdv, sm
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_comm_count_by_host(&self->simcall, rdv, host);
+    if (0) SIMIX_rdv_comm_count_by_host(rdv, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_COMM_COUNT_BY_HOST;
@@ -1443,11 +1487,11 @@ inline static unsigned int simcall_BODY_rdv_comm_count_by_host(smx_rdv_t rdv, sm
     return self->simcall.result.ui;
   }
   
-inline static smx_action_t simcall_BODY_rdv_get_head(smx_rdv_t rdv) {
+inline static smx_synchro_t simcall_BODY_rdv_get_head(smx_rdv_t rdv) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_get_head(&self->simcall, rdv);
+    if (0) SIMIX_rdv_get_head(rdv);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_GET_HEAD;
@@ -1468,7 +1512,7 @@ inline static void simcall_BODY_rdv_set_receiver(smx_rdv_t rdv, smx_process_t re
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_set_receiver(&self->simcall, rdv, receiver);
+    if (0) SIMIX_rdv_set_receiver(rdv, receiver);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_SET_RECEIVER;
@@ -1490,7 +1534,7 @@ inline static smx_process_t simcall_BODY_rdv_get_receiver(smx_rdv_t rdv) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_rdv_get_receiver(&self->simcall, rdv);
+    if (0) SIMIX_rdv_get_receiver(rdv);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_RDV_GET_RECEIVER;
@@ -1507,11 +1551,11 @@ inline static smx_process_t simcall_BODY_rdv_get_receiver(smx_rdv_t rdv) {
     return self->simcall.result.dp;
   }
   
-inline static smx_action_t simcall_BODY_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, simix_match_func_t match_fun, void* data) {
+inline static smx_synchro_t simcall_BODY_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, simix_match_func_t match_fun, void* data) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_iprobe(&self->simcall, rdv, type, src, tag, match_fun, data);
+    if (0) simcall_HANDLER_comm_iprobe(&self->simcall, rdv, type, src, tag, match_fun, data);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_IPROBE;
@@ -1537,7 +1581,7 @@ inline static void simcall_BODY_comm_send(smx_process_t src, smx_rdv_t rdv, doub
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_send(&self->simcall, src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout);
+    if (0) simcall_HANDLER_comm_send(&self->simcall, src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_SEND;
@@ -1563,11 +1607,11 @@ inline static void simcall_BODY_comm_send(smx_process_t src, smx_rdv_t rdv, doub
     
   }
   
-inline static smx_action_t simcall_BODY_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached) {
+inline static smx_synchro_t simcall_BODY_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_isend(&self->simcall, src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached);
+    if (0) simcall_HANDLER_comm_isend(&self->simcall, src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_ISEND;
@@ -1598,7 +1642,7 @@ inline static void simcall_BODY_comm_recv(smx_rdv_t rdv, void* dst_buff, size_t*
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_recv(&self->simcall, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate);
+    if (0) simcall_HANDLER_comm_recv(&self->simcall, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_RECV;
@@ -1622,11 +1666,11 @@ inline static void simcall_BODY_comm_recv(smx_rdv_t rdv, void* dst_buff, size_t*
     
   }
   
-inline static smx_action_t simcall_BODY_comm_irecv(smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate) {
+inline static smx_synchro_t simcall_BODY_comm_irecv(smx_rdv_t rdv, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_irecv(&self->simcall, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
+    if (0) simcall_HANDLER_comm_irecv(&self->simcall, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_IRECV;
@@ -1649,11 +1693,11 @@ inline static smx_action_t simcall_BODY_comm_irecv(smx_rdv_t rdv, void* dst_buff
     return self->simcall.result.dp;
   }
   
-inline static void simcall_BODY_comm_cancel(smx_action_t comm) {
+inline static void simcall_BODY_comm_cancel(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_cancel(&self->simcall, comm);
+    if (0) SIMIX_comm_cancel(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_CANCEL;
@@ -1674,7 +1718,7 @@ inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_waitany(&self->simcall, comms);
+    if (0) simcall_HANDLER_comm_waitany(&self->simcall, comms);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_WAITANY;
@@ -1691,11 +1735,11 @@ inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms) {
     return self->simcall.result.i;
   }
   
-inline static void simcall_BODY_comm_wait(smx_action_t comm, double timeout) {
+inline static void simcall_BODY_comm_wait(smx_synchro_t comm, double timeout) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_wait(&self->simcall, comm, timeout);
+    if (0) simcall_HANDLER_comm_wait(&self->simcall, comm, timeout);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_WAIT;
@@ -1713,11 +1757,11 @@ inline static void simcall_BODY_comm_wait(smx_action_t comm, double timeout) {
     
   }
   
-inline static int simcall_BODY_comm_test(smx_action_t comm) {
+inline static int simcall_BODY_comm_test(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_test(&self->simcall, comm);
+    if (0) simcall_HANDLER_comm_test(&self->simcall, comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_TEST;
@@ -1738,7 +1782,7 @@ inline static int simcall_BODY_comm_testany(xbt_dynar_t comms) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_testany(&self->simcall, comms);
+    if (0) simcall_HANDLER_comm_testany(&self->simcall, comms);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_TESTANY;
@@ -1755,11 +1799,11 @@ inline static int simcall_BODY_comm_testany(xbt_dynar_t comms) {
     return self->simcall.result.i;
   }
   
-inline static double simcall_BODY_comm_get_remains(smx_action_t comm) {
+inline static double simcall_BODY_comm_get_remains(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_remains(&self->simcall, comm);
+    if (0) SIMIX_comm_get_remains(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_REMAINS;
@@ -1776,11 +1820,11 @@ inline static double simcall_BODY_comm_get_remains(smx_action_t comm) {
     return self->simcall.result.d;
   }
   
-inline static int simcall_BODY_comm_get_state(smx_action_t comm) {
+inline static e_smx_state_t simcall_BODY_comm_get_state(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_state(&self->simcall, comm);
+    if (0) SIMIX_comm_get_state(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_STATE;
@@ -1797,11 +1841,11 @@ inline static int simcall_BODY_comm_get_state(smx_action_t comm) {
     return self->simcall.result.i;
   }
   
-inline static void* simcall_BODY_comm_get_src_data(smx_action_t comm) {
+inline static void* simcall_BODY_comm_get_src_data(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_src_data(&self->simcall, comm);
+    if (0) SIMIX_comm_get_src_data(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_SRC_DATA;
@@ -1818,11 +1862,11 @@ inline static void* simcall_BODY_comm_get_src_data(smx_action_t comm) {
     return self->simcall.result.dp;
   }
   
-inline static void* simcall_BODY_comm_get_dst_data(smx_action_t comm) {
+inline static void* simcall_BODY_comm_get_dst_data(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_dst_data(&self->simcall, comm);
+    if (0) SIMIX_comm_get_dst_data(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_DST_DATA;
@@ -1839,11 +1883,11 @@ inline static void* simcall_BODY_comm_get_dst_data(smx_action_t comm) {
     return self->simcall.result.dp;
   }
   
-inline static smx_process_t simcall_BODY_comm_get_src_proc(smx_action_t comm) {
+inline static smx_process_t simcall_BODY_comm_get_src_proc(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_src_proc(&self->simcall, comm);
+    if (0) SIMIX_comm_get_src_proc(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_SRC_PROC;
@@ -1860,11 +1904,11 @@ inline static smx_process_t simcall_BODY_comm_get_src_proc(smx_action_t comm) {
     return self->simcall.result.dp;
   }
   
-inline static smx_process_t simcall_BODY_comm_get_dst_proc(smx_action_t comm) {
+inline static smx_process_t simcall_BODY_comm_get_dst_proc(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_get_dst_proc(&self->simcall, comm);
+    if (0) SIMIX_comm_get_dst_proc(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COMM_GET_DST_PROC;
@@ -1885,7 +1929,7 @@ inline static smx_mutex_t simcall_BODY_mutex_init() {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mutex_init(&self->simcall);
+    if (0) simcall_HANDLER_mutex_init(&self->simcall);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_MUTEX_INIT;
@@ -1906,7 +1950,7 @@ inline static void simcall_BODY_mutex_destroy(smx_mutex_t mutex) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mutex_destroy(&self->simcall, mutex);
+    if (0) SIMIX_mutex_destroy(mutex);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_MUTEX_DESTROY;
@@ -1927,7 +1971,7 @@ inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mutex_lock(&self->simcall, mutex);
+    if (0) simcall_HANDLER_mutex_lock(&self->simcall, mutex);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_MUTEX_LOCK;
@@ -1948,7 +1992,7 @@ inline static int simcall_BODY_mutex_trylock(smx_mutex_t mutex) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mutex_trylock(&self->simcall, mutex);
+    if (0) simcall_HANDLER_mutex_trylock(&self->simcall, mutex);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_MUTEX_TRYLOCK;
@@ -1969,7 +2013,7 @@ inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mutex_unlock(&self->simcall, mutex);
+    if (0) simcall_HANDLER_mutex_unlock(&self->simcall, mutex);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_MUTEX_UNLOCK;
@@ -1990,7 +2034,7 @@ inline static smx_cond_t simcall_BODY_cond_init() {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_init(&self->simcall);
+    if (0) SIMIX_cond_init();
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_INIT;
@@ -2011,7 +2055,7 @@ inline static void simcall_BODY_cond_destroy(smx_cond_t cond) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_destroy(&self->simcall, cond);
+    if (0) SIMIX_cond_destroy(cond);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_DESTROY;
@@ -2032,7 +2076,7 @@ inline static void simcall_BODY_cond_signal(smx_cond_t cond) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_signal(&self->simcall, cond);
+    if (0) SIMIX_cond_signal(cond);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_SIGNAL;
@@ -2053,7 +2097,7 @@ inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_wait(&self->simcall, cond, mutex);
+    if (0) simcall_HANDLER_cond_wait(&self->simcall, cond, mutex);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_WAIT;
@@ -2075,7 +2119,7 @@ inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t m
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_wait_timeout(&self->simcall, cond, mutex, timeout);
+    if (0) simcall_HANDLER_cond_wait_timeout(&self->simcall, cond, mutex, timeout);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_WAIT_TIMEOUT;
@@ -2098,7 +2142,7 @@ inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_cond_broadcast(&self->simcall, cond);
+    if (0) SIMIX_cond_broadcast(cond);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_COND_BROADCAST;
@@ -2115,17 +2159,17 @@ inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) {
     
   }
   
-inline static smx_sem_t simcall_BODY_sem_init(int capacity) {
+inline static smx_sem_t simcall_BODY_sem_init(unsigned int capacity) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_init(&self->simcall, capacity);
+    if (0) SIMIX_sem_init(capacity);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_INIT;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].i = (int) capacity;
+    self->simcall.args[0].ui = (unsigned int) capacity;
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
@@ -2140,7 +2184,7 @@ inline static void simcall_BODY_sem_destroy(smx_sem_t sem) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_destroy(&self->simcall, sem);
+    if (0) SIMIX_sem_destroy(sem);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_DESTROY;
@@ -2161,7 +2205,7 @@ inline static void simcall_BODY_sem_release(smx_sem_t sem) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_release(&self->simcall, sem);
+    if (0) simcall_HANDLER_sem_release(&self->simcall, sem);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_RELEASE;
@@ -2182,7 +2226,7 @@ inline static int simcall_BODY_sem_would_block(smx_sem_t sem) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_would_block(&self->simcall, sem);
+    if (0) simcall_HANDLER_sem_would_block(&self->simcall, sem);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_WOULD_BLOCK;
@@ -2203,7 +2247,7 @@ inline static void simcall_BODY_sem_acquire(smx_sem_t sem) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_acquire(&self->simcall, sem);
+    if (0) simcall_HANDLER_sem_acquire(&self->simcall, sem);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_ACQUIRE;
@@ -2224,7 +2268,7 @@ inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeou
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_acquire_timeout(&self->simcall, sem, timeout);
+    if (0) simcall_HANDLER_sem_acquire_timeout(&self->simcall, sem, timeout);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_ACQUIRE_TIMEOUT;
@@ -2246,7 +2290,7 @@ inline static int simcall_BODY_sem_get_capacity(smx_sem_t sem) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_sem_get_capacity(&self->simcall, sem);
+    if (0) simcall_HANDLER_sem_get_capacity(&self->simcall, sem);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SEM_GET_CAPACITY;
@@ -2267,7 +2311,7 @@ inline static sg_size_t simcall_BODY_file_read(smx_file_t fd, sg_size_t size, sm
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_read(&self->simcall, fd, size, host);
+    if (0) simcall_HANDLER_file_read(&self->simcall, fd, size, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_READ;
@@ -2290,7 +2334,7 @@ inline static sg_size_t simcall_BODY_file_write(smx_file_t fd, sg_size_t size, s
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_write(&self->simcall, fd, size, host);
+    if (0) simcall_HANDLER_file_write(&self->simcall, fd, size, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_WRITE;
@@ -2313,7 +2357,7 @@ inline static smx_file_t simcall_BODY_file_open(const char* fullpath, smx_host_t
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_open(&self->simcall, fullpath, host);
+    if (0) simcall_HANDLER_file_open(&self->simcall, fullpath, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_OPEN;
@@ -2335,7 +2379,7 @@ inline static int simcall_BODY_file_close(smx_file_t fd, smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_close(&self->simcall, fd, host);
+    if (0) simcall_HANDLER_file_close(&self->simcall, fd, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_CLOSE;
@@ -2357,7 +2401,7 @@ inline static int simcall_BODY_file_unlink(smx_file_t fd, smx_host_t host) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_unlink(&self->simcall, fd, host);
+    if (0) SIMIX_file_unlink(fd, host);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_UNLINK;
@@ -2379,7 +2423,7 @@ inline static sg_size_t simcall_BODY_file_get_size(smx_file_t fd) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_get_size(&self->simcall, fd);
+    if (0) simcall_HANDLER_file_get_size(&self->simcall, fd);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_GET_SIZE;
@@ -2400,7 +2444,7 @@ inline static sg_size_t simcall_BODY_file_tell(smx_file_t fd) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_tell(&self->simcall, fd);
+    if (0) simcall_HANDLER_file_tell(&self->simcall, fd);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_TELL;
@@ -2421,7 +2465,7 @@ inline static int simcall_BODY_file_seek(smx_file_t fd, sg_offset_t offset, int
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_seek(&self->simcall, fd, offset, origin);
+    if (0) simcall_HANDLER_file_seek(&self->simcall, fd, offset, origin);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_SEEK;
@@ -2444,7 +2488,7 @@ inline static xbt_dynar_t simcall_BODY_file_get_info(smx_file_t fd) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_get_info(&self->simcall, fd);
+    if (0) simcall_HANDLER_file_get_info(&self->simcall, fd);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_GET_INFO;
@@ -2465,7 +2509,7 @@ inline static int simcall_BODY_file_move(smx_file_t fd, const char* fullpath) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_file_move(&self->simcall, fd, fullpath);
+    if (0) simcall_HANDLER_file_move(&self->simcall, fd, fullpath);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_FILE_MOVE;
@@ -2487,7 +2531,7 @@ inline static sg_size_t simcall_BODY_storage_get_free_size(smx_storage_t storage
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_storage_get_free_size(&self->simcall, storage);
+    if (0) simcall_HANDLER_storage_get_free_size(&self->simcall, storage);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_STORAGE_GET_FREE_SIZE;
@@ -2508,7 +2552,7 @@ inline static sg_size_t simcall_BODY_storage_get_used_size(smx_storage_t name) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_storage_get_used_size(&self->simcall, name);
+    if (0) simcall_HANDLER_storage_get_used_size(&self->simcall, name);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_STORAGE_GET_USED_SIZE;
@@ -2529,7 +2573,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_properties(smx_storage_t stora
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_storage_get_properties(&self->simcall, storage);
+    if (0) SIMIX_storage_get_properties(storage);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_STORAGE_GET_PROPERTIES;
@@ -2550,7 +2594,7 @@ inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage)
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_storage_get_content(&self->simcall, storage);
+    if (0) SIMIX_storage_get_content(storage);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_STORAGE_GET_CONTENT;
@@ -2571,7 +2615,7 @@ inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_asr_get_properties(&self->simcall, name);
+    if (0) simcall_HANDLER_asr_get_properties(&self->simcall, name);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_ASR_GET_PROPERTIES;
@@ -2587,19 +2631,19 @@ inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) {
     }    
     return self->simcall.result.dp;
   }
-#ifdef HAVE_LATENCY_BOUND_TRACKING
   
-inline static int simcall_BODY_comm_is_latency_bounded(smx_action_t comm) {
+inline static int simcall_BODY_mc_random(int min, int max) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_comm_is_latency_bounded(&self->simcall, comm);
+    if (0) simcall_HANDLER_mc_random(&self->simcall, min, max);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
-    self->simcall.call = SIMCALL_COMM_IS_LATENCY_BOUNDED;
+    self->simcall.call = SIMCALL_MC_RANDOM;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) comm;
+    self->simcall.args[0].i = (int) min;
+    self->simcall.args[1].i = (int) max;
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
@@ -2609,21 +2653,18 @@ inline static int simcall_BODY_comm_is_latency_bounded(smx_action_t comm) {
     }    
     return self->simcall.result.i;
   }
-#endif
-
-#ifdef HAVE_TRACING
   
-inline static void simcall_BODY_set_category(smx_action_t action, const char* category) {
+inline static void simcall_BODY_set_category(smx_synchro_t synchro, const char* category) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_set_category(&self->simcall, action, category);
+    if (0) SIMIX_set_category(synchro, category);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
     self->simcall.call = SIMCALL_SET_CATEGORY;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) action;
+    self->simcall.args[0].dp = (void*) synchro;
     self->simcall.args[1].cc = (const char*) category;
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
@@ -2634,21 +2675,19 @@ inline static void simcall_BODY_set_category(smx_action_t action, const char* ca
     }    
     
   }
-#endif
-
-#ifdef HAVE_MC
+#ifdef HAVE_LATENCY_BOUND_TRACKING
   
-inline static void* simcall_BODY_mc_snapshot() {
+inline static int simcall_BODY_comm_is_latency_bounded(smx_synchro_t comm) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mc_snapshot(&self->simcall);
+    if (0) SIMIX_comm_is_latency_bounded(comm);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
-    self->simcall.call = SIMCALL_MC_SNAPSHOT;
+    self->simcall.call = SIMCALL_COMM_IS_LATENCY_BOUNDED;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-
+    self->simcall.args[0].dp = (void*) comm;
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
@@ -2656,21 +2695,23 @@ inline static void* simcall_BODY_mc_snapshot() {
     } else {
       SIMIX_simcall_handle(&self->simcall, 0);
     }    
-    return self->simcall.result.dp;
+    return self->simcall.result.i;
   }
+#endif
+
+#ifdef HAVE_MC
   
-inline static int simcall_BODY_mc_compare_snapshots(void* s1, void* s2) {
+inline static mc_snapshot_t simcall_BODY_mc_snapshot() {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mc_compare_snapshots(&self->simcall, s1, s2);
+    if (0) simcall_HANDLER_mc_snapshot(&self->simcall);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
-    self->simcall.call = SIMCALL_MC_COMPARE_SNAPSHOTS;
+    self->simcall.call = SIMCALL_MC_SNAPSHOT;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].dp = (void*) s1;
-    self->simcall.args[1].dp = (void*) s2;
+
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
@@ -2678,21 +2719,21 @@ inline static int simcall_BODY_mc_compare_snapshots(void* s1, void* s2) {
     } else {
       SIMIX_simcall_handle(&self->simcall, 0);
     }    
-    return self->simcall.result.i;
+    return self->simcall.result.dp;
   }
   
-inline static int simcall_BODY_mc_random(int min, int max) {
+inline static int simcall_BODY_mc_compare_snapshots(mc_snapshot_t s1, mc_snapshot_t s2) {
     smx_process_t self = SIMIX_process_self();
 
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) SIMIX_pre_mc_random(&self->simcall, min, max);
+    if (0) simcall_HANDLER_mc_compare_snapshots(&self->simcall, s1, s2);
     /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */
 
-    self->simcall.call = SIMCALL_MC_RANDOM;
+    self->simcall.call = SIMCALL_MC_COMPARE_SNAPSHOTS;
     memset(&self->simcall.result, 0, sizeof(self->simcall.result));
     memset(self->simcall.args, 0, sizeof(self->simcall.args));
-    self->simcall.args[0].i = (int) min;
-    self->simcall.args[1].i = (int) max;
+    self->simcall.args[0].dp = (void*) s1;
+    self->simcall.args[1].dp = (void*) s2;
     if (self != simix_global->maestro_process) {
       XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
                 SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);