convert the last vm simcall into s4u code

[simgrid.git] / src / simix / popping_bodies.cpp

diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index de6f794..774b702 100644 (file)
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -35,38 +35,6 @@ inline static R simcall(e_smx_simcall_t call, T const&... t)
   return simgrid::simix::unmarshal<R>(self->simcall.result);
 }
   
-inline static void simcall_BODY_vm_suspend(sg_host_t ind_vm) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_vm_suspend(&SIMIX_process_self()->simcall, ind_vm);
-    return simcall<void, sg_host_t>(SIMCALL_VM_SUSPEND, ind_vm);
-  }
-  
-inline static void simcall_BODY_vm_resume(sg_host_t ind_vm) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_vm_resume(ind_vm);
-    return simcall<void, sg_host_t>(SIMCALL_VM_RESUME, ind_vm);
-  }
-  
-inline static void simcall_BODY_vm_shutdown(sg_host_t ind_vm) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_vm_shutdown(&SIMIX_process_self()->simcall, ind_vm);
-    return simcall<void, sg_host_t>(SIMCALL_VM_SHUTDOWN, ind_vm);
-  }
-  
-inline static void simcall_BODY_vm_save(sg_host_t ind_vm) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_vm_save(&SIMIX_process_self()->simcall, ind_vm);
-    return simcall<void, sg_host_t>(SIMCALL_VM_SAVE, ind_vm);
-  }
-  
-inline static void simcall_BODY_vm_restore(sg_host_t ind_vm) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_vm_restore(ind_vm);
-    return simcall<void, sg_host_t>(SIMCALL_VM_RESTORE, ind_vm);
-  }
-  
 inline static void simcall_BODY_process_kill(smx_actor_t process) {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_process_kill(&SIMIX_process_self()->simcall, process);
@@ -93,8 +61,7 @@ inline static void simcall_BODY_process_suspend(smx_actor_t process) {
   
 inline static void simcall_BODY_process_resume(smx_actor_t process) {
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_process_resume(process);
+    if (0) SIMIX_process_resume(process);
     return simcall<void, smx_actor_t>(SIMCALL_PROCESS_RESUME, process);
   }
   
@@ -127,17 +94,11 @@ inline static smx_activity_t simcall_BODY_execution_start(const char* name, doub
     if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound);
     return simcall<smx_activity_t, const char*, double, double, double>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound);
   }
-
-  inline static smx_activity_t simcall_BODY_execution_parallel_start(const char* name, int host_nb,
-                                                                     sg_host_t* host_list, double* flops_amount,
-                                                                     double* bytes_amount, double amount, double rate,
-                                                                     double timeout)
-  {
+  
+inline static smx_activity_t simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) {
     /* Go to that function to follow the code flow through the simcall barrier */
-    if (0)
-      SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
-    return simcall<smx_activity_t, const char*, int, sg_host_t*, double*, double*, double, double, double>(
-        SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
+    if (0) SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
+    return simcall<smx_activity_t, const char*, int, sg_host_t*, double*, double*, double, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout);
   }
   
 inline static void simcall_BODY_execution_cancel(smx_activity_t execution) {
@@ -422,12 +383,6 @@ inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage)
     return simcall<xbt_dict_t, smx_storage_t>(SIMCALL_STORAGE_GET_CONTENT, storage);
   }
   
-inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) {
-    /* Go to that function to follow the code flow through the simcall barrier */
-    if (0) simcall_HANDLER_asr_get_properties(&SIMIX_process_self()->simcall, name);
-    return simcall<xbt_dict_t, const char*>(SIMCALL_ASR_GET_PROPERTIES, name);
-  }
-  
 inline static int simcall_BODY_mc_random(int min, int max) {
     /* Go to that function to follow the code flow through the simcall barrier */
     if (0) simcall_HANDLER_mc_random(&SIMIX_process_self()->simcall, min, max);