X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e4a01d6e38e856dafa1a08942143a8ec7f5e34..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/popping_accessors.hpp

diff --git a/src/simix/popping_accessors.hpp b/src/simix/popping_accessors.hpp
index 020056e3f0..5b2d81fb57 100644
--- a/src/simix/popping_accessors.hpp
+++ b/src/simix/popping_accessors.hpp
@@ -4,7 +4,7 @@
 /*                    DO NOT EVER CHANGE THIS FILE                    */
 /*                                                                    */
 /* change simcalls specification in src/simix/simcalls.in             */
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.    */
+/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.    */
 /**********************************************************************/
 
 /*
@@ -15,32 +15,6 @@
  */
 
 #include "src/simix/popping_private.hpp"
-static inline int simcall_process_killall__get__reset_pid(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<int>(simcall->args[0]);
-}
-static inline int simcall_process_killall__getraw__reset_pid(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<int>(simcall->args[0]);
-}
-static inline void simcall_process_killall__set__reset_pid(smx_simcall_t simcall, int arg)
-{
-  simgrid::simix::marshal<int>(simcall->args[0], arg);
-}
-
-static inline smx_actor_t simcall_process_cleanup__get__process(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
-}
-static inline smx_actor_t simcall_process_cleanup__getraw__process(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
-}
-static inline void simcall_process_cleanup__set__process(smx_simcall_t simcall, smx_actor_t arg)
-{
-  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
-}
-
 static inline smx_actor_t simcall_process_suspend__get__process(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
@@ -116,164 +90,6 @@ static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int
   simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline const char* simcall_execution_start__get__name(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
-}
-static inline const char* simcall_execution_start__getraw__name(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<const char*>(simcall->args[0]);
-}
-static inline void simcall_execution_start__set__name(smx_simcall_t simcall, const char* arg)
-{
-  simgrid::simix::marshal<const char*>(simcall->args[0], arg);
-}
-static inline double simcall_execution_start__get__flops_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double>(simcall->args[1]);
-}
-static inline double simcall_execution_start__getraw__flops_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double>(simcall->args[1]);
-}
-static inline void simcall_execution_start__set__flops_amount(smx_simcall_t simcall, double arg)
-{
-  simgrid::simix::marshal<double>(simcall->args[1], arg);
-}
-static inline double simcall_execution_start__get__priority(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double>(simcall->args[2]);
-}
-static inline double simcall_execution_start__getraw__priority(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double>(simcall->args[2]);
-}
-static inline void simcall_execution_start__set__priority(smx_simcall_t simcall, double arg)
-{
-  simgrid::simix::marshal<double>(simcall->args[2], arg);
-}
-static inline double simcall_execution_start__get__bound(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double>(simcall->args[3]);
-}
-static inline double simcall_execution_start__getraw__bound(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double>(simcall->args[3]);
-}
-static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, double arg)
-{
-  simgrid::simix::marshal<double>(simcall->args[3], arg);
-}
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> simcall_execution_start__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result);
-}
-static inline simgrid::kernel::activity::ExecImpl* simcall_execution_start__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->result);
-}
-static inline void simcall_execution_start__set__result(smx_simcall_t simcall, boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> result)
-{
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result, result);
-}
-
-static inline const char* simcall_execution_parallel_start__get__name(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
-}
-static inline const char* simcall_execution_parallel_start__getraw__name(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<const char*>(simcall->args[0]);
-}
-static inline void simcall_execution_parallel_start__set__name(smx_simcall_t simcall, const char* arg)
-{
-  simgrid::simix::marshal<const char*>(simcall->args[0], arg);
-}
-static inline int simcall_execution_parallel_start__get__host_nb(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<int>(simcall->args[1]);
-}
-static inline int simcall_execution_parallel_start__getraw__host_nb(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<int>(simcall->args[1]);
-}
-static inline void simcall_execution_parallel_start__set__host_nb(smx_simcall_t simcall, int arg)
-{
-  simgrid::simix::marshal<int>(simcall->args[1], arg);
-}
-static inline sg_host_t* simcall_execution_parallel_start__get__host_list(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_host_t*>(simcall->args[2]);
-}
-static inline sg_host_t* simcall_execution_parallel_start__getraw__host_list(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<sg_host_t*>(simcall->args[2]);
-}
-static inline void simcall_execution_parallel_start__set__host_list(smx_simcall_t simcall, sg_host_t* arg)
-{
-  simgrid::simix::marshal<sg_host_t*>(simcall->args[2], arg);
-}
-static inline double* simcall_execution_parallel_start__get__flops_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double*>(simcall->args[3]);
-}
-static inline double* simcall_execution_parallel_start__getraw__flops_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double*>(simcall->args[3]);
-}
-static inline void simcall_execution_parallel_start__set__flops_amount(smx_simcall_t simcall, double* arg)
-{
-  simgrid::simix::marshal<double*>(simcall->args[3], arg);
-}
-static inline double* simcall_execution_parallel_start__get__bytes_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double*>(simcall->args[4]);
-}
-static inline double* simcall_execution_parallel_start__getraw__bytes_amount(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double*>(simcall->args[4]);
-}
-static inline void simcall_execution_parallel_start__set__bytes_amount(smx_simcall_t simcall, double* arg)
-{
-  simgrid::simix::marshal<double*>(simcall->args[4], arg);
-}
-static inline double simcall_execution_parallel_start__get__rate(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double>(simcall->args[5]);
-}
-static inline double simcall_execution_parallel_start__getraw__rate(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double>(simcall->args[5]);
-}
-static inline void simcall_execution_parallel_start__set__rate(smx_simcall_t simcall, double arg)
-{
-  simgrid::simix::marshal<double>(simcall->args[5], arg);
-}
-static inline double simcall_execution_parallel_start__get__timeout(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<double>(simcall->args[6]);
-}
-static inline double simcall_execution_parallel_start__getraw__timeout(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<double>(simcall->args[6]);
-}
-static inline void simcall_execution_parallel_start__set__timeout(smx_simcall_t simcall, double arg)
-{
-  simgrid::simix::marshal<double>(simcall->args[6], arg);
-}
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> simcall_execution_parallel_start__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result);
-}
-static inline simgrid::kernel::activity::ExecImpl* simcall_execution_parallel_start__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ExecImpl*>(simcall->result);
-}
-static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> result)
-{
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>>(simcall->result, result);
-}
-
 static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_execution_wait__get__execution(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0]);
@@ -299,41 +115,32 @@ static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, in
   simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_actor_t simcall_process_on_exit__get__process(smx_simcall_t simcall)
+static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+simcall_execution_test__get__execution(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_actor_t>(simcall->args[0]);
-}
-static inline smx_actor_t simcall_process_on_exit__getraw__process(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_actor_t>(simcall->args[0]);
-}
-static inline void simcall_process_on_exit__set__process(smx_simcall_t simcall, smx_actor_t arg)
-{
-  simgrid::simix::marshal<smx_actor_t>(simcall->args[0], arg);
-}
-static inline int_f_pvoid_pvoid_t simcall_process_on_exit__get__fun(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<int_f_pvoid_pvoid_t>(simcall->args[1]);
+  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0]);
 }
-static inline int_f_pvoid_pvoid_t simcall_process_on_exit__getraw__fun(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::ActivityImpl* simcall_execution_test__getraw__execution(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<int_f_pvoid_pvoid_t>(simcall->args[1]);
+  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(simcall->args[0]);
 }
-static inline void simcall_process_on_exit__set__fun(smx_simcall_t simcall, int_f_pvoid_pvoid_t arg)
+static inline void
+simcall_execution_test__set__execution(smx_simcall_t simcall,
+                                       boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> arg)
 {
-  simgrid::simix::marshal<int_f_pvoid_pvoid_t>(simcall->args[1], arg);
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline void* simcall_process_on_exit__get__data(smx_simcall_t simcall)
+static inline int simcall_execution_test__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<void*>(simcall->args[2]);
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
-static inline void* simcall_process_on_exit__getraw__data(smx_simcall_t simcall)
+static inline int simcall_execution_test__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<void*>(simcall->args[2]);
+  return simgrid::simix::unmarshal_raw<int>(simcall->result);
 }
-static inline void simcall_process_on_exit__set__data(smx_simcall_t simcall, void* arg)
+static inline void simcall_execution_test__set__result(smx_simcall_t simcall, int result)
 {
-  simgrid::simix::marshal<void*>(simcall->args[2], arg);
+  simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_mailbox_t simcall_comm_iprobe__get__mbox(smx_simcall_t simcall)
@@ -1056,32 +863,6 @@ static inline void simcall_mutex_unlock__set__mutex(smx_simcall_t simcall, smx_m
   simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 
-static inline smx_cond_t simcall_cond_init__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_cond_t>(simcall->result);
-}
-static inline smx_cond_t simcall_cond_init__getraw__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->result);
-}
-static inline void simcall_cond_init__set__result(smx_simcall_t simcall, smx_cond_t result)
-{
-  simgrid::simix::marshal<smx_cond_t>(simcall->result, result);
-}
-
-static inline smx_cond_t simcall_cond_signal__get__cond(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
-}
-static inline smx_cond_t simcall_cond_signal__getraw__cond(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
-}
-static inline void simcall_cond_signal__set__cond(smx_simcall_t simcall, smx_cond_t arg)
-{
-  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
-}
-
 static inline smx_cond_t simcall_cond_wait__get__cond(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
@@ -1143,18 +924,17 @@ static inline void simcall_cond_wait_timeout__set__timeout(smx_simcall_t simcall
 {
   simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
-
-static inline smx_cond_t simcall_cond_broadcast__get__cond(smx_simcall_t simcall)
+static inline int simcall_cond_wait_timeout__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
-static inline smx_cond_t simcall_cond_broadcast__getraw__cond(smx_simcall_t simcall)
+static inline int simcall_cond_wait_timeout__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<smx_cond_t>(simcall->args[0]);
+  return simgrid::simix::unmarshal_raw<int>(simcall->result);
 }
-static inline void simcall_cond_broadcast__set__cond(smx_simcall_t simcall, smx_cond_t arg)
+static inline void simcall_cond_wait_timeout__set__result(smx_simcall_t simcall, int result)
 {
-  simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
+  simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_sem_t simcall_sem_acquire__get__sem(smx_simcall_t simcall)
@@ -1194,77 +974,42 @@ static inline void simcall_sem_acquire_timeout__set__timeout(smx_simcall_t simca
 {
   simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
-
-static inline surf_storage_t simcall_storage_read__get__st(smx_simcall_t simcall)
+static inline int simcall_sem_acquire_timeout__get__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<surf_storage_t>(simcall->args[0]);
-}
-static inline surf_storage_t simcall_storage_read__getraw__st(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<surf_storage_t>(simcall->args[0]);
-}
-static inline void simcall_storage_read__set__st(smx_simcall_t simcall, surf_storage_t arg)
-{
-  simgrid::simix::marshal<surf_storage_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_storage_read__get__size(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
-}
-static inline sg_size_t simcall_storage_read__getraw__size(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->args[1]);
-}
-static inline void simcall_storage_read__set__size(smx_simcall_t simcall, sg_size_t arg)
-{
-  simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
-}
-static inline sg_size_t simcall_storage_read__get__result(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
+  return simgrid::simix::unmarshal<int>(simcall->result);
 }
-static inline sg_size_t simcall_storage_read__getraw__result(smx_simcall_t simcall)
+static inline int simcall_sem_acquire_timeout__getraw__result(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->result);
+  return simgrid::simix::unmarshal_raw<int>(simcall->result);
 }
-static inline void simcall_storage_read__set__result(smx_simcall_t simcall, sg_size_t result)
+static inline void simcall_sem_acquire_timeout__set__result(smx_simcall_t simcall, int result)
 {
-  simgrid::simix::marshal<sg_size_t>(simcall->result, result);
+  simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline surf_storage_t simcall_storage_write__get__st(smx_simcall_t simcall)
+static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>
+simcall_io_wait__get__io(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal<surf_storage_t>(simcall->args[0]);
-}
-static inline surf_storage_t simcall_storage_write__getraw__st(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<surf_storage_t>(simcall->args[0]);
-}
-static inline void simcall_storage_write__set__st(smx_simcall_t simcall, surf_storage_t arg)
-{
-  simgrid::simix::marshal<surf_storage_t>(simcall->args[0], arg);
-}
-static inline sg_size_t simcall_storage_write__get__size(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
+  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0]);
 }
-static inline sg_size_t simcall_storage_write__getraw__size(smx_simcall_t simcall)
+static inline simgrid::kernel::activity::ActivityImpl* simcall_io_wait__getraw__io(smx_simcall_t simcall)
 {
-  return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->args[1]);
+  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(simcall->args[0]);
 }
-static inline void simcall_storage_write__set__size(smx_simcall_t simcall, sg_size_t arg)
+static inline void simcall_io_wait__set__io(smx_simcall_t simcall,
+                                            boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> arg)
 {
-  simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
+  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
 }
-static inline sg_size_t simcall_storage_write__get__result(smx_simcall_t simcall)
+static inline sg_size_t simcall_io_wait__get__result(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
-static inline sg_size_t simcall_storage_write__getraw__result(smx_simcall_t simcall)
+static inline sg_size_t simcall_io_wait__getraw__result(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal_raw<sg_size_t>(simcall->result);
 }
-static inline void simcall_storage_write__set__result(smx_simcall_t simcall, sg_size_t result)
+static inline void simcall_io_wait__set__result(smx_simcall_t simcall, sg_size_t result)
 {
   simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
@@ -1306,31 +1051,6 @@ static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int res
   simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_set_category__get__synchro(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0]);
-}
-static inline simgrid::kernel::activity::ActivityImpl* simcall_set_category__getraw__synchro(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(simcall->args[0]);
-}
-static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> arg)
-{
-  simgrid::simix::marshal<boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl>>(simcall->args[0], arg);
-}
-static inline const char* simcall_set_category__get__category(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
-}
-static inline const char* simcall_set_category__getraw__category(smx_simcall_t simcall)
-{
-  return simgrid::simix::unmarshal_raw<const char*>(simcall->args[1]);
-}
-static inline void simcall_set_category__set__category(smx_simcall_t simcall, const char* arg)
-{
-  simgrid::simix::marshal<const char*>(simcall->args[1], arg);
-}
-
 static inline std::function<void()> const* simcall_run_kernel__get__code(smx_simcall_t simcall)
 {
   return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]);
@@ -1359,12 +1079,13 @@ static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::f
 
 /* The prototype of all simcall handlers, automatically generated for you */
 
-XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid);
 XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process);
 XBT_PRIVATE void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout);
 XBT_PRIVATE void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration);
-XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl> simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority, double bound);
 XBT_PRIVATE void simcall_HANDLER_execution_wait(smx_simcall_t simcall, boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution);
+XBT_PRIVATE void
+simcall_HANDLER_execution_test(smx_simcall_t simcall,
+                               boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> execution);
 XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data);
 XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout);
 XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, 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);
@@ -1381,6 +1102,6 @@ XBT_PRIVATE void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t con
 XBT_PRIVATE void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout);
 XBT_PRIVATE void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem);
 XBT_PRIVATE void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout);
-XBT_PRIVATE void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size);
-XBT_PRIVATE void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size);
+XBT_PRIVATE void simcall_HANDLER_io_wait(smx_simcall_t simcall,
+                                         boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> io);
 XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max);
\ No newline at end of file