From: Arnaud Giersch Date: Mon, 9 Oct 2017 19:34:05 +0000 (+0200) Subject: simcalls.py: improve indentation of generated files. X-Git-Tag: v3.18~504^2~9 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fe503dfa41c532a17a4fc3f6b244e72e7783d386 simcalls.py: improve indentation of generated files. --- diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h index a101a80017..cd425d9746 100644 --- a/src/simix/popping_accessors.h +++ b/src/simix/popping_accessors.h @@ -86,8 +86,9 @@ static inline int simcall_process_join__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_process_join__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_process_join__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline double simcall_process_sleep__get__duration(smx_simcall_t simcall) @@ -110,8 +111,9 @@ static inline int simcall_process_sleep__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline const char* simcall_execution_start__get__name(smx_simcall_t simcall) @@ -162,8 +164,7 @@ static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, do { simgrid::simix::marshal(simcall->args[3], arg); } -static inline boost::intrusive_ptr -simcall_execution_start__get__result(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_execution_start__get__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->result); } @@ -171,9 +172,7 @@ static inline simgrid::kernel::activity::ExecImpl* simcall_execution_start__getr { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void -simcall_execution_start__set__result(smx_simcall_t simcall, - boost::intrusive_ptr result) +static inline void simcall_execution_start__set__result(smx_simcall_t simcall, boost::intrusive_ptr result) { simgrid::simix::marshal>(simcall->result, result); } @@ -262,25 +261,20 @@ static inline void simcall_execution_parallel_start__set__timeout(smx_simcall_t { simgrid::simix::marshal(simcall->args[6], arg); } -static inline boost::intrusive_ptr -simcall_execution_parallel_start__get__result(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_execution_parallel_start__get__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->result); } -static inline simgrid::kernel::activity::ExecImpl* -simcall_execution_parallel_start__getraw__result(smx_simcall_t simcall) +static inline simgrid::kernel::activity::ExecImpl* simcall_execution_parallel_start__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void -simcall_execution_parallel_start__set__result(smx_simcall_t simcall, - boost::intrusive_ptr result) +static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, boost::intrusive_ptr result) { simgrid::simix::marshal>(simcall->result, result); } -static inline boost::intrusive_ptr -simcall_execution_wait__get__execution(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_execution_wait__get__execution(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->args[0]); } @@ -288,9 +282,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_execution_wait__g { return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void -simcall_execution_wait__set__execution(smx_simcall_t simcall, - boost::intrusive_ptr arg) +static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, boost::intrusive_ptr arg) { simgrid::simix::marshal>(simcall->args[0], arg); } @@ -302,8 +294,9 @@ static inline int simcall_execution_wait__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline smx_actor_t simcall_process_on_exit__get__process(smx_simcall_t simcall) @@ -391,8 +384,7 @@ static inline void simcall_comm_iprobe__set__data(smx_simcall_t simcall, void* a { simgrid::simix::marshal(simcall->args[3], arg); } -static inline boost::intrusive_ptr -simcall_comm_iprobe__get__result(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_comm_iprobe__get__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->result); } @@ -400,9 +392,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_iprobe__getr { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void -simcall_comm_iprobe__set__result(smx_simcall_t simcall, - boost::intrusive_ptr result) +static inline void simcall_comm_iprobe__set__result(smx_simcall_t simcall, boost::intrusive_ptr result) { simgrid::simix::marshal>(simcall->result, result); } @@ -660,8 +650,7 @@ static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int { simgrid::simix::marshal(simcall->args[10], arg); } -static inline boost::intrusive_ptr -simcall_comm_isend__get__result(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_comm_isend__get__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->result); } @@ -669,8 +658,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_isend__getra { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, - boost::intrusive_ptr result) +static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, boost::intrusive_ptr result) { simgrid::simix::marshal>(simcall->result, result); } @@ -880,8 +868,7 @@ static inline void simcall_comm_irecv__set__rate(smx_simcall_t simcall, double a { simgrid::simix::marshal(simcall->args[7], arg); } -static inline boost::intrusive_ptr -simcall_comm_irecv__get__result(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_comm_irecv__get__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->result); } @@ -889,8 +876,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_irecv__getra { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, - boost::intrusive_ptr result) +static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, boost::intrusive_ptr result) { simgrid::simix::marshal>(simcall->result, result); } @@ -927,12 +913,12 @@ static inline int simcall_comm_waitany__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_waitany__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_comm_waitany__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr -simcall_comm_wait__get__comm(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_comm_wait__get__comm(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->args[0]); } @@ -940,8 +926,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_wait__getraw { return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, - boost::intrusive_ptr arg) +static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, boost::intrusive_ptr arg) { simgrid::simix::marshal>(simcall->args[0], arg); } @@ -958,8 +943,7 @@ static inline void simcall_comm_wait__set__timeout(smx_simcall_t simcall, double simgrid::simix::marshal(simcall->args[1], arg); } -static inline boost::intrusive_ptr -simcall_comm_test__get__comm(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_comm_test__get__comm(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->args[0]); } @@ -967,8 +951,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_test__getraw { return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, - boost::intrusive_ptr arg) +static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, boost::intrusive_ptr arg) { simgrid::simix::marshal>(simcall->args[0], arg); } @@ -980,12 +963,12 @@ static inline int simcall_comm_test__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr* -simcall_comm_testany__get__comms(smx_simcall_t simcall) +static inline boost::intrusive_ptr* simcall_comm_testany__get__comms(smx_simcall_t simcall) { return simgrid::simix::unmarshal*>(simcall->args[0]); } @@ -993,8 +976,7 @@ static inline simgrid::kernel::activity::ActivityImpl** simcall_comm_testany__ge { return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall, - boost::intrusive_ptr* arg) +static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall, boost::intrusive_ptr* arg) { simgrid::simix::marshal*>(simcall->args[0], arg); } @@ -1018,8 +1000,9 @@ static inline int simcall_comm_testany__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_testany__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_comm_testany__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline smx_mutex_t simcall_mutex_lock__get__mutex(smx_simcall_t simcall) @@ -1055,8 +1038,9 @@ static inline int simcall_mutex_trylock__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_mutex_trylock__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_mutex_trylock__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline smx_mutex_t simcall_mutex_unlock__get__mutex(smx_simcall_t simcall) @@ -1080,8 +1064,9 @@ static inline smx_cond_t simcall_cond_init__getraw__result(smx_simcall_t simcall { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_cond_init__set__result(smx_simcall_t simcall, smx_cond_t result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_cond_init__set__result(smx_simcall_t simcall, smx_cond_t result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline smx_cond_t simcall_cond_signal__get__cond(smx_simcall_t simcall) @@ -1242,8 +1227,9 @@ static inline sg_size_t simcall_file_read__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_file_read__set__result(smx_simcall_t simcall, sg_size_t result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_file_read__set__result(smx_simcall_t simcall, sg_size_t result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline surf_file_t simcall_file_write__get__fd(smx_simcall_t simcall) @@ -1278,8 +1264,9 @@ static inline sg_size_t simcall_file_write__getraw__result(smx_simcall_t simcall { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_file_write__set__result(smx_simcall_t simcall, sg_size_t result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_file_write__set__result(smx_simcall_t simcall, sg_size_t result) +{ + simgrid::simix::marshal(simcall->result, result); } static inline int simcall_mc_random__get__min(smx_simcall_t simcall) @@ -1314,12 +1301,12 @@ static inline int simcall_mc_random__getraw__result(smx_simcall_t simcall) { return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int result){ - simgrid::simix::marshal(simcall->result, result); +static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int result) +{ + simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr -simcall_set_category__get__synchro(smx_simcall_t simcall) +static inline boost::intrusive_ptr simcall_set_category__get__synchro(smx_simcall_t simcall) { return simgrid::simix::unmarshal>(simcall->args[0]); } @@ -1327,8 +1314,7 @@ static inline simgrid::kernel::activity::ActivityImpl* simcall_set_category__get { return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, - boost::intrusive_ptr arg) +static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, boost::intrusive_ptr arg) { simgrid::simix::marshal>(simcall->args[0], arg); } @@ -1377,35 +1363,17 @@ XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int rese 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 -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 execution); -XBT_PRIVATE boost::intrusive_ptr -simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, simix_match_func_t match_fun, - void* data); +XBT_PRIVATE boost::intrusive_ptr 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 execution); +XBT_PRIVATE boost::intrusive_ptr 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 -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); +XBT_PRIVATE boost::intrusive_ptr 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); XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, 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 timeout, double rate); -XBT_PRIVATE boost::intrusive_ptr -simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, 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); +XBT_PRIVATE boost::intrusive_ptr simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, 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); XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms, double timeout); -XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, - boost::intrusive_ptr comm, - double timeout); -XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, - boost::intrusive_ptr comm); -XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, - boost::intrusive_ptr* comms, - size_t count); +XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, boost::intrusive_ptr comm, double timeout); +XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, boost::intrusive_ptr comm); +XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, boost::intrusive_ptr* comms, size_t count); XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex); XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex); XBT_PRIVATE void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex); diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 4f3e9a7ef1..270cdc7d90 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -14,10 +14,10 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include #include "smx_private.h" #include "src/mc/mc_forward.hpp" #include "xbt/ex.h" +#include #include /** @cond */ // Please Doxygen, don't look at this @@ -36,247 +36,240 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) return simgrid::simix::unmarshal(self->simcall.result); } -inline static void simcall_BODY_process_killall(int reset_pid) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_process_killall(&SIMIX_process_self()->simcall, reset_pid); - return simcall(SIMCALL_PROCESS_KILLALL, reset_pid); - } +inline static void simcall_BODY_process_killall(int reset_pid) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_process_killall(&SIMIX_process_self()->simcall, reset_pid); + return simcall(SIMCALL_PROCESS_KILLALL, reset_pid); +} -inline static void simcall_BODY_process_cleanup(smx_actor_t process) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_process_cleanup(process); - return simcall(SIMCALL_PROCESS_CLEANUP, process); - } +inline static void simcall_BODY_process_cleanup(smx_actor_t process) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_process_cleanup(process); + return simcall(SIMCALL_PROCESS_CLEANUP, process); +} -inline static void simcall_BODY_process_suspend(smx_actor_t process) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_process_suspend(&SIMIX_process_self()->simcall, process); - return simcall(SIMCALL_PROCESS_SUSPEND, process); - } +inline static void simcall_BODY_process_suspend(smx_actor_t process) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_process_suspend(&SIMIX_process_self()->simcall, process); + return simcall(SIMCALL_PROCESS_SUSPEND, process); +} -inline static int simcall_BODY_process_join(smx_actor_t process, double timeout) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_process_join(&SIMIX_process_self()->simcall, process, timeout); - return simcall(SIMCALL_PROCESS_JOIN, process, timeout); - } +inline static int simcall_BODY_process_join(smx_actor_t process, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_process_join(&SIMIX_process_self()->simcall, process, timeout); + return simcall(SIMCALL_PROCESS_JOIN, process, timeout); +} -inline static int simcall_BODY_process_sleep(double duration) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_process_sleep(&SIMIX_process_self()->simcall, duration); - return simcall(SIMCALL_PROCESS_SLEEP, duration); - } +inline static int simcall_BODY_process_sleep(double duration) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_process_sleep(&SIMIX_process_self()->simcall, duration); + return simcall(SIMCALL_PROCESS_SLEEP, duration); +} - inline static boost::intrusive_ptr - simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound); - return simcall, const char*, double, double, double>( - SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); - } +inline static boost::intrusive_ptr simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound); + return simcall, const char*, double, double, double>(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); +} - inline static boost::intrusive_ptr - simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_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, rate, timeout); - return simcall, const char*, int, sg_host_t*, double*, - double*, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, - bytes_amount, rate, timeout); - } +inline static boost::intrusive_ptr simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + return simcall, const char*, int, sg_host_t*, double*, double*, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); +} - inline static int simcall_BODY_execution_wait(boost::intrusive_ptr execution) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_execution_wait(&SIMIX_process_self()->simcall, execution); - return simcall>(SIMCALL_EXECUTION_WAIT, - execution); - } +inline static int simcall_BODY_execution_wait(boost::intrusive_ptr execution) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_execution_wait(&SIMIX_process_self()->simcall, execution); + return simcall>(SIMCALL_EXECUTION_WAIT, execution); +} -inline static void simcall_BODY_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_process_on_exit(process, fun, data); - return simcall(SIMCALL_PROCESS_ON_EXIT, process, fun, data); - } +inline static void simcall_BODY_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_process_on_exit(process, fun, data); + return simcall(SIMCALL_PROCESS_ON_EXIT, process, fun, data); +} - inline static boost::intrusive_ptr - simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) - simcall_HANDLER_comm_iprobe(&SIMIX_process_self()->simcall, mbox, type, match_fun, data); - return simcall, smx_mailbox_t, int, - simix_match_func_t, void*>(SIMCALL_COMM_IPROBE, mbox, type, match_fun, data); - } +inline static boost::intrusive_ptr simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_iprobe(&SIMIX_process_self()->simcall, mbox, type, match_fun, data); + return simcall, smx_mailbox_t, int, simix_match_func_t, void*>(SIMCALL_COMM_IPROBE, mbox, type, match_fun, data); +} -inline static void simcall_BODY_comm_send(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) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_send(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); - return simcall(SIMCALL_COMM_SEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); - } +inline static void simcall_BODY_comm_send(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) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_send(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); + return simcall(SIMCALL_COMM_SEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); +} - inline static boost::intrusive_ptr - simcall_BODY_comm_isend(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) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_isend(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); - return simcall, smx_actor_t, smx_mailbox_t, double, - double, void*, size_t, simix_match_func_t, simix_clean_func_t, simix_copy_data_func_t, void*, int>( - SIMCALL_COMM_ISEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, - data, detached); - } +inline static boost::intrusive_ptr simcall_BODY_comm_isend(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) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_isend(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); + return simcall, smx_actor_t, smx_mailbox_t, double, double, void*, size_t, simix_match_func_t, simix_clean_func_t, simix_copy_data_func_t, void*, int>(SIMCALL_COMM_ISEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); +} -inline static void simcall_BODY_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, 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 timeout, double rate) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_recv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); - return simcall(SIMCALL_COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); - } +inline static void simcall_BODY_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, 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 timeout, double rate) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_recv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); + return simcall(SIMCALL_COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); +} - inline static boost::intrusive_ptr - simcall_BODY_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, 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) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_irecv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); - return simcall, smx_actor_t, smx_mailbox_t, void*, - size_t*, simix_match_func_t, simix_copy_data_func_t, void*, double>( - SIMCALL_COMM_IRECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); - } +inline static boost::intrusive_ptr simcall_BODY_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, 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) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_irecv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); + return simcall, smx_actor_t, smx_mailbox_t, void*, size_t*, simix_match_func_t, simix_copy_data_func_t, void*, double>(SIMCALL_COMM_IRECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); +} -inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms, double timeout) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_waitany(&SIMIX_process_self()->simcall, comms, timeout); - return simcall(SIMCALL_COMM_WAITANY, comms, timeout); - } +inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_waitany(&SIMIX_process_self()->simcall, comms, timeout); + return simcall(SIMCALL_COMM_WAITANY, comms, timeout); +} - inline static void simcall_BODY_comm_wait(boost::intrusive_ptr comm, - double timeout) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_wait(&SIMIX_process_self()->simcall, comm, timeout); - return simcall, double>(SIMCALL_COMM_WAIT, comm, - timeout); - } +inline static void simcall_BODY_comm_wait(boost::intrusive_ptr comm, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_wait(&SIMIX_process_self()->simcall, comm, timeout); + return simcall, double>(SIMCALL_COMM_WAIT, comm, timeout); +} - inline static int simcall_BODY_comm_test(boost::intrusive_ptr comm) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_test(&SIMIX_process_self()->simcall, comm); - return simcall>(SIMCALL_COMM_TEST, comm); - } +inline static int simcall_BODY_comm_test(boost::intrusive_ptr comm) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_test(&SIMIX_process_self()->simcall, comm); + return simcall>(SIMCALL_COMM_TEST, comm); +} - inline static int simcall_BODY_comm_testany(boost::intrusive_ptr* comms, - size_t count) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_comm_testany(&SIMIX_process_self()->simcall, comms, count); - return simcall*, size_t>(SIMCALL_COMM_TESTANY, - comms, count); - } +inline static int simcall_BODY_comm_testany(boost::intrusive_ptr* comms, size_t count) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_comm_testany(&SIMIX_process_self()->simcall, comms, count); + return simcall*, size_t>(SIMCALL_COMM_TESTANY, comms, count); +} -inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_mutex_lock(&SIMIX_process_self()->simcall, mutex); - return simcall(SIMCALL_MUTEX_LOCK, mutex); - } +inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_mutex_lock(&SIMIX_process_self()->simcall, mutex); + return simcall(SIMCALL_MUTEX_LOCK, mutex); +} -inline static int simcall_BODY_mutex_trylock(smx_mutex_t mutex) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_mutex_trylock(&SIMIX_process_self()->simcall, mutex); - return simcall(SIMCALL_MUTEX_TRYLOCK, mutex); - } +inline static int simcall_BODY_mutex_trylock(smx_mutex_t mutex) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_mutex_trylock(&SIMIX_process_self()->simcall, mutex); + return simcall(SIMCALL_MUTEX_TRYLOCK, mutex); +} -inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_mutex_unlock(&SIMIX_process_self()->simcall, mutex); - return simcall(SIMCALL_MUTEX_UNLOCK, mutex); - } +inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_mutex_unlock(&SIMIX_process_self()->simcall, mutex); + return simcall(SIMCALL_MUTEX_UNLOCK, mutex); +} -inline static smx_cond_t simcall_BODY_cond_init() { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_cond_init(); - return simcall(SIMCALL_COND_INIT); - } +inline static smx_cond_t simcall_BODY_cond_init() +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_cond_init(); + return simcall(SIMCALL_COND_INIT); +} -inline static void simcall_BODY_cond_signal(smx_cond_t cond) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_cond_signal(cond); - return simcall(SIMCALL_COND_SIGNAL, cond); - } +inline static void simcall_BODY_cond_signal(smx_cond_t cond) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_cond_signal(cond); + return simcall(SIMCALL_COND_SIGNAL, cond); +} -inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_cond_wait(&SIMIX_process_self()->simcall, cond, mutex); - return simcall(SIMCALL_COND_WAIT, cond, mutex); - } +inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_cond_wait(&SIMIX_process_self()->simcall, cond, mutex); + return simcall(SIMCALL_COND_WAIT, cond, mutex); +} -inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_cond_wait_timeout(&SIMIX_process_self()->simcall, cond, mutex, timeout); - return simcall(SIMCALL_COND_WAIT_TIMEOUT, cond, mutex, timeout); - } +inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_cond_wait_timeout(&SIMIX_process_self()->simcall, cond, mutex, timeout); + return simcall(SIMCALL_COND_WAIT_TIMEOUT, cond, mutex, timeout); +} -inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_cond_broadcast(cond); - return simcall(SIMCALL_COND_BROADCAST, cond); - } +inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_cond_broadcast(cond); + return simcall(SIMCALL_COND_BROADCAST, cond); +} -inline static void simcall_BODY_sem_acquire(smx_sem_t sem) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_sem_acquire(&SIMIX_process_self()->simcall, sem); - return simcall(SIMCALL_SEM_ACQUIRE, sem); - } +inline static void simcall_BODY_sem_acquire(smx_sem_t sem) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_sem_acquire(&SIMIX_process_self()->simcall, sem); + return simcall(SIMCALL_SEM_ACQUIRE, sem); +} -inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeout) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_sem_acquire_timeout(&SIMIX_process_self()->simcall, sem, timeout); - return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); - } +inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeout) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_sem_acquire_timeout(&SIMIX_process_self()->simcall, sem, timeout); + return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); +} - inline static sg_size_t simcall_BODY_file_read(surf_file_t fd, sg_size_t size) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) - simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size); - return simcall(SIMCALL_FILE_READ, fd, size); - } +inline static sg_size_t simcall_BODY_file_read(surf_file_t fd, sg_size_t size) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size); + return simcall(SIMCALL_FILE_READ, fd, size); +} - inline static sg_size_t simcall_BODY_file_write(surf_file_t fd, sg_size_t size) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) - simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size); - return simcall(SIMCALL_FILE_WRITE, fd, size); - } +inline static sg_size_t simcall_BODY_file_write(surf_file_t fd, sg_size_t size) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size); + return simcall(SIMCALL_FILE_WRITE, fd, size); +} -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); - return simcall(SIMCALL_MC_RANDOM, min, max); - } +inline static int simcall_BODY_mc_random(int min, int max) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + simcall_HANDLER_mc_random(&SIMIX_process_self()->simcall, min, max); + return simcall(SIMCALL_MC_RANDOM, min, max); +} - inline static void simcall_BODY_set_category(boost::intrusive_ptr synchro, - const char* category) - { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_set_category(synchro, category); - return simcall, const char*>( - SIMCALL_SET_CATEGORY, synchro, category); - } +inline static void simcall_BODY_set_category(boost::intrusive_ptr synchro, const char* category) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_set_category(synchro, category); + return simcall, const char*>(SIMCALL_SET_CATEGORY, synchro, category); +} -inline static void simcall_BODY_run_kernel(std::function const* code) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_run_kernel(code); - return simcall const*>(SIMCALL_RUN_KERNEL, code); - } +inline static void simcall_BODY_run_kernel(std::function const* code) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_run_kernel(code); + return simcall const*>(SIMCALL_RUN_KERNEL, code); +} -inline static void simcall_BODY_run_blocking(std::function const* code) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_run_blocking(code); - return simcall const*>(SIMCALL_RUN_BLOCKING, code); - }/** @endcond */ +inline static void simcall_BODY_run_blocking(std::function const* code) +{ + if (0) /* Go to that function to follow the code flow through the simcall barrier */ + SIMIX_run_blocking(code); + return simcall const*>(SIMCALL_RUN_BLOCKING, code); +} /** @endcond */ diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp index 7f4fc93b45..b3c410175b 100644 --- a/src/simix/popping_generated.cpp +++ b/src/simix/popping_generated.cpp @@ -14,8 +14,8 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include #include "smx_private.h" +#include #if SIMGRID_HAVE_MC #include "src/mc/mc_forward.hpp" #endif @@ -73,203 +73,156 @@ void SIMIX_simcall_handle(smx_simcall_t simcall, int value) { return; switch (simcall->call) { case SIMCALL_PROCESS_KILLALL: - simcall_HANDLER_process_killall(simcall, simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + simcall_HANDLER_process_killall(simcall, simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_PROCESS_CLEANUP: - SIMIX_process_cleanup(simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + SIMIX_process_cleanup(simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_PROCESS_SUSPEND: - simcall_HANDLER_process_suspend(simcall, simgrid::simix::unmarshal(simcall->args[0])); - break; + simcall_HANDLER_process_suspend(simcall, simgrid::simix::unmarshal(simcall->args[0])); + break; case SIMCALL_PROCESS_JOIN: - simcall_HANDLER_process_join(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); - break; + simcall_HANDLER_process_join(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); + break; case SIMCALL_PROCESS_SLEEP: - simcall_HANDLER_process_sleep(simcall, simgrid::simix::unmarshal(simcall->args[0])); - break; + simcall_HANDLER_process_sleep(simcall, simgrid::simix::unmarshal(simcall->args[0])); + break; case SIMCALL_EXECUTION_START: - simgrid::simix::marshal>( - simcall->result, - simcall_HANDLER_execution_start(simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1]), - simgrid::simix::unmarshal(simcall->args[2]), - simgrid::simix::unmarshal(simcall->args[3]))); + simgrid::simix::marshal>(simcall->result, simcall_HANDLER_execution_start(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]))); SIMIX_simcall_answer(simcall); break; case SIMCALL_EXECUTION_PARALLEL_START: - simgrid::simix::marshal>( - simcall->result, - SIMIX_execution_parallel_start( - simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), - simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), - simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), - simgrid::simix::unmarshal(simcall->args[6]))); + simgrid::simix::marshal>(simcall->result, SIMIX_execution_parallel_start(simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]))); SIMIX_simcall_answer(simcall); break; case SIMCALL_EXECUTION_WAIT: - simcall_HANDLER_execution_wait( - simcall, - simgrid::simix::unmarshal>(simcall->args[0])); + simcall_HANDLER_execution_wait(simcall, simgrid::simix::unmarshal>(simcall->args[0])); break; case SIMCALL_PROCESS_ON_EXIT: - SIMIX_process_on_exit(simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2])); - SIMIX_simcall_answer(simcall); - break; + SIMIX_process_on_exit(simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_COMM_IPROBE: - simgrid::simix::marshal>( - simcall->result, simcall_HANDLER_comm_iprobe(simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1]), - simgrid::simix::unmarshal(simcall->args[2]), - simgrid::simix::unmarshal(simcall->args[3]))); + simgrid::simix::marshal>(simcall->result, simcall_HANDLER_comm_iprobe(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]))); SIMIX_simcall_answer(simcall); break; case SIMCALL_COMM_SEND: - simcall_HANDLER_comm_send(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]), simgrid::simix::unmarshal(simcall->args[8]), simgrid::simix::unmarshal(simcall->args[9])); - break; + simcall_HANDLER_comm_send(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]), simgrid::simix::unmarshal(simcall->args[8]), simgrid::simix::unmarshal(simcall->args[9])); + break; case SIMCALL_COMM_ISEND: - simgrid::simix::marshal>( - simcall->result, - simcall_HANDLER_comm_isend( - simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1]), - simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), - simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), - simgrid::simix::unmarshal(simcall->args[6]), - simgrid::simix::unmarshal(simcall->args[7]), - simgrid::simix::unmarshal(simcall->args[8]), - simgrid::simix::unmarshal(simcall->args[9]), simgrid::simix::unmarshal(simcall->args[10]))); + simgrid::simix::marshal>(simcall->result, simcall_HANDLER_comm_isend(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]), simgrid::simix::unmarshal(simcall->args[8]), simgrid::simix::unmarshal(simcall->args[9]), simgrid::simix::unmarshal(simcall->args[10]))); SIMIX_simcall_answer(simcall); break; case SIMCALL_COMM_RECV: - simcall_HANDLER_comm_recv(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]), simgrid::simix::unmarshal(simcall->args[8])); - break; + simcall_HANDLER_comm_recv(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]), simgrid::simix::unmarshal(simcall->args[8])); + break; case SIMCALL_COMM_IRECV: - simgrid::simix::marshal>( - simcall->result, simcall_HANDLER_comm_irecv(simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1]), - simgrid::simix::unmarshal(simcall->args[2]), - simgrid::simix::unmarshal(simcall->args[3]), - simgrid::simix::unmarshal(simcall->args[4]), - simgrid::simix::unmarshal(simcall->args[5]), - simgrid::simix::unmarshal(simcall->args[6]), - simgrid::simix::unmarshal(simcall->args[7]))); + simgrid::simix::marshal>(simcall->result, simcall_HANDLER_comm_irecv(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2]), simgrid::simix::unmarshal(simcall->args[3]), simgrid::simix::unmarshal(simcall->args[4]), simgrid::simix::unmarshal(simcall->args[5]), simgrid::simix::unmarshal(simcall->args[6]), simgrid::simix::unmarshal(simcall->args[7]))); SIMIX_simcall_answer(simcall); break; case SIMCALL_COMM_WAITANY: - simcall_HANDLER_comm_waitany(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); - break; + simcall_HANDLER_comm_waitany(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); + break; case SIMCALL_COMM_WAIT: - simcall_HANDLER_comm_wait( - simcall, - simgrid::simix::unmarshal>(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); + simcall_HANDLER_comm_wait(simcall, simgrid::simix::unmarshal>(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); break; case SIMCALL_COMM_TEST: - simcall_HANDLER_comm_test( - simcall, - simgrid::simix::unmarshal>(simcall->args[0])); + simcall_HANDLER_comm_test(simcall, simgrid::simix::unmarshal>(simcall->args[0])); break; case SIMCALL_COMM_TESTANY: - simcall_HANDLER_comm_testany( - simcall, - simgrid::simix::unmarshal*>(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); + simcall_HANDLER_comm_testany(simcall, simgrid::simix::unmarshal*>(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); break; case SIMCALL_MUTEX_LOCK: - simcall_HANDLER_mutex_lock(simcall, simgrid::simix::unmarshal(simcall->args[0])); - break; + simcall_HANDLER_mutex_lock(simcall, simgrid::simix::unmarshal(simcall->args[0])); + break; case SIMCALL_MUTEX_TRYLOCK: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_mutex_trylock(simcall, simgrid::simix::unmarshal(simcall->args[0]))); - SIMIX_simcall_answer(simcall); - break; + simgrid::simix::marshal(simcall->result, simcall_HANDLER_mutex_trylock(simcall, simgrid::simix::unmarshal(simcall->args[0]))); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_MUTEX_UNLOCK: - simcall_HANDLER_mutex_unlock(simcall, simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + simcall_HANDLER_mutex_unlock(simcall, simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_COND_INIT: - simgrid::simix::marshal(simcall->result, SIMIX_cond_init()); - SIMIX_simcall_answer(simcall); - break; + simgrid::simix::marshal(simcall->result, SIMIX_cond_init()); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_COND_SIGNAL: - SIMIX_cond_signal(simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + SIMIX_cond_signal(simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_COND_WAIT: - simcall_HANDLER_cond_wait(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); - break; + simcall_HANDLER_cond_wait(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); + break; case SIMCALL_COND_WAIT_TIMEOUT: - simcall_HANDLER_cond_wait_timeout(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2])); - break; + simcall_HANDLER_cond_wait_timeout(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]), simgrid::simix::unmarshal(simcall->args[2])); + break; case SIMCALL_COND_BROADCAST: - SIMIX_cond_broadcast(simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + SIMIX_cond_broadcast(simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_SEM_ACQUIRE: - simcall_HANDLER_sem_acquire(simcall, simgrid::simix::unmarshal(simcall->args[0])); - break; + simcall_HANDLER_sem_acquire(simcall, simgrid::simix::unmarshal(simcall->args[0])); + break; case SIMCALL_SEM_ACQUIRE_TIMEOUT: - simcall_HANDLER_sem_acquire_timeout(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); - break; + simcall_HANDLER_sem_acquire_timeout(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); + break; case SIMCALL_FILE_READ: - simcall_HANDLER_file_read(simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); + simcall_HANDLER_file_read(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); break; case SIMCALL_FILE_WRITE: - simcall_HANDLER_file_write(simcall, simgrid::simix::unmarshal(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); + simcall_HANDLER_file_write(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); break; case SIMCALL_MC_RANDOM: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_mc_random(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]))); - SIMIX_simcall_answer(simcall); - break; + simgrid::simix::marshal(simcall->result, simcall_HANDLER_mc_random(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]))); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_SET_CATEGORY: - SIMIX_set_category( - simgrid::simix::unmarshal>(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); + SIMIX_set_category(simgrid::simix::unmarshal>(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); SIMIX_simcall_answer(simcall); break; case SIMCALL_RUN_KERNEL: - SIMIX_run_kernel(simgrid::simix::unmarshal const*>(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; + SIMIX_run_kernel(simgrid::simix::unmarshal const*>(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; case SIMCALL_RUN_BLOCKING: - SIMIX_run_blocking(simgrid::simix::unmarshal const*>(simcall->args[0])); - break; + SIMIX_run_blocking(simgrid::simix::unmarshal const*>(simcall->args[0])); + break; case NUM_SIMCALLS: break; case SIMCALL_NONE: diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 4465a6420c..88da721f11 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -41,8 +41,9 @@ class Simcall(object): if self.name not in self.simcalls_BODY: print ('# ERROR: No function calling simcall_BODY_%s' % self.name) print ('# Add something like this to libsmx.c:') - print ('%s simcall_%s(%s) {' % (self.res.rettype(), self.name, ', '. + print ('%s simcall_%s(%s)' % (self.res.rettype(), self.name, ', '. join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))) + print ('{') print (' return simcall_BODY_%s(%s);' % (self.name, "...")) print ('}') return False @@ -59,8 +60,9 @@ class Simcall(object): if self.name not in self.simcalls_PRE: print ('# ERROR: No function called simcall_HANDLER_%s' % self.name) print ('# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):') - print ('%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {' % (self.res.rettype(), self.name, ''. + print ('%s simcall_HANDLER_%s(smx_simcall_t simcall%s)' % (self.res.rettype(), self.name, ''. join(', %s %s' % (arg.rettype(), arg.name)for arg in self.args))) + print ('{') print (' // Your code handling the simcall') print ('}') return False @@ -98,7 +100,7 @@ class Simcall(object): res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg)' % ( self.name, arg.name, arg.rettype())) res.append('{') - res.append(' simgrid::simix::marshal<%s>(simcall->args[%i], arg);' % (arg.rettype(), i)) + res.append(' simgrid::simix::marshal<%s>(simcall->args[%i], arg);' % (arg.rettype(), i)) res.append('}') # Return value getter/setters @@ -107,16 +109,16 @@ class Simcall(object): res.append( 'static inline %s simcall_%s__get__result(smx_simcall_t simcall)' % (self.res.rettype(), self.name)) res.append('{') - - res.append(' return simgrid::simix::unmarshal<%s>(simcall->result);' % self.res.rettype()) + res.append(' return simgrid::simix::unmarshal<%s>(simcall->result);' % self.res.rettype()) res.append('}') - res.append( - 'static inline %s simcall_%s__getraw__result(smx_simcall_t simcall){' % (rawtype, self.name)) - res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->result);' % rawtype) + res.append('static inline %s simcall_%s__getraw__result(smx_simcall_t simcall)' % (rawtype, self.name)) + res.append('{') + res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->result);' % rawtype) res.append('}') res.append( - 'static inline void simcall_%s__set__result(smx_simcall_t simcall, %s result){' % (self.name, self.res.rettype())) - res.append(' simgrid::simix::marshal<%s>(simcall->result, result);' % (self.res.rettype())) + 'static inline void simcall_%s__set__result(smx_simcall_t simcall, %s result)' % (self.name, self.res.rettype())) + res.append('{') + res.append(' simgrid::simix::marshal<%s>(simcall->result, result);' % (self.res.rettype())) res.append('}') return '\n'.join(res) @@ -132,36 +134,36 @@ class Simcall(object): else: call = "SIMIX_%s(%s)" % (self.name, ', '.join(args)) if self.call_kind == 'Func': - res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call)) + res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call)) else: - res.append(" " + call + ";"); + res.append(" " + call + ";"); if self.call_kind != 'Blck': - res.append(' SIMIX_simcall_answer(simcall);') - res.append(' break;') + res.append(' SIMIX_simcall_answer(simcall);') + res.append(' break;') res.append('') return '\n'.join(res) def body(self): res = [''] res.append( - 'inline static %s simcall_BODY_%s(%s) {' % (self.res.rettype(), + 'inline static %s simcall_BODY_%s(%s)' % (self.res.rettype(), self.name, ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))) - res.append( - ' /* Go to that function to follow the code flow through the simcall barrier */') + res.append('{') + res.append(' if (0) /* Go to that function to follow the code flow through the simcall barrier */') if self.need_handler: - res.append(' if (0) simcall_HANDLER_%s(%s);' % (self.name, - ', '.join(["&SIMIX_process_self()->simcall"] + [arg.name for arg in self.args]))) + res.append(' simcall_HANDLER_%s(%s);' % (self.name, + ', '.join(["&SIMIX_process_self()->simcall"] + [arg.name for arg in self.args]))) else: - res.append(' if (0) SIMIX_%s(%s);' % (self.name, + res.append(' SIMIX_%s(%s);' % (self.name, ', '.join(arg.name for arg in self.args))) - res.append(' return simcall<%s%s>(SIMCALL_%s%s);' % ( + res.append(' return simcall<%s%s>(SIMCALL_%s%s);' % ( self.res.rettype(), "".join([ ", " + arg.rettype() for i, arg in enumerate(self.args) ]), self.name.upper(), "".join([ ", " + arg.name for i, arg in enumerate(self.args) ]) )); - res.append(' }') + res.append('}') return '\n'.join(res) def handler_prototype(self): @@ -304,8 +306,8 @@ if __name__ == '__main__': fd = header("popping_generated.cpp") - fd.write('#include \n') fd.write('#include "smx_private.h"\n') + fd.write('#include \n') fd.write('#if SIMGRID_HAVE_MC\n') fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#endif\n') @@ -324,7 +326,7 @@ if __name__ == '__main__': fd.write('/** @private\n') fd.write( ' * @brief (in kernel mode) unpack the simcall and activate the handler\n') - fd.write(' * \n') + fd.write(' *\n') fd.write(' * This function is generated from src/simix/simcalls.in\n') fd.write(' */\n') fd.write( @@ -357,10 +359,10 @@ if __name__ == '__main__': # smx_popping_bodies.cpp # fd = header('popping_bodies.cpp') - fd.write('#include \n') fd.write('#include "smx_private.h"\n') fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#include "xbt/ex.h"\n') + fd.write('#include \n') fd.write('#include \n') fd.write("/** @cond */ // Please Doxygen, don't look at this\n") fd.write(''' @@ -380,5 +382,5 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) } ''') handle(fd, Simcall.body, simcalls, simcalls_dict) - fd.write("/** @endcond */\n"); + fd.write(" /** @endcond */\n"); fd.close()