X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/706a0c36671aa5ab7afe12afe987cc1c72f049ac..98d5c6b1131ff3bf60e100e8cfcce9fc79bd77eb:/src/simix/popping_accessors.hpp diff --git a/src/simix/popping_accessors.hpp b/src/simix/popping_accessors.hpp index 59f4308e74..98a6521a6f 100644 --- a/src/simix/popping_accessors.hpp +++ b/src/simix/popping_accessors.hpp @@ -90,17 +90,17 @@ static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr simcall_execution_wait__get__execution(smx_simcall_t simcall) +static inline simgrid::kernel::activity::ExecImpl* simcall_execution_wait__get__execution(smx_simcall_t simcall) { - return simgrid::simix::unmarshal>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl* simcall_execution_wait__getraw__execution(smx_simcall_t simcall) +static inline simgrid::kernel::activity::ExecImpl* simcall_execution_wait__getraw__execution(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + 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, simgrid::kernel::activity::ExecImpl* arg) { - simgrid::simix::marshal>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } static inline int simcall_execution_wait__get__result(smx_simcall_t simcall) { @@ -115,32 +115,29 @@ static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, in simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr -simcall_execution_test__get__execution(smx_simcall_t simcall) +static inline simgrid::kernel::activity::ExecImpl* simcall_execution_test__get__execution(smx_simcall_t simcall) { - return simgrid::simix::unmarshal>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl* simcall_execution_test__getraw__execution(smx_simcall_t simcall) +static inline simgrid::kernel::activity::ExecImpl* simcall_execution_test__getraw__execution(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void -simcall_execution_test__set__execution(smx_simcall_t simcall, - boost::intrusive_ptr arg) +static inline void simcall_execution_test__set__execution(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* arg) { - simgrid::simix::marshal>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } -static inline int simcall_execution_test__get__result(smx_simcall_t simcall) +static inline bool simcall_execution_test__get__result(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->result); + return simgrid::simix::unmarshal(simcall->result); } -static inline int simcall_execution_test__getraw__result(smx_simcall_t simcall) +static inline bool simcall_execution_test__getraw__result(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->result); + return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_execution_test__set__result(smx_simcall_t simcall, int result) +static inline void simcall_execution_test__set__result(smx_simcall_t simcall, bool result) { - simgrid::simix::marshal(simcall->result, result); + simgrid::simix::marshal(simcall->result, result); } static inline smx_actor_t simcall_comm_send__get__sender(smx_simcall_t simcall) @@ -191,17 +188,17 @@ static inline void simcall_comm_send__set__rate(smx_simcall_t simcall, double ar { simgrid::simix::marshal(simcall->args[3], arg); } -static inline void* simcall_comm_send__get__src_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_send__get__src_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->args[4]); + return simgrid::simix::unmarshal(simcall->args[4]); } -static inline void* simcall_comm_send__getraw__src_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_send__getraw__src_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[4]); + return simgrid::simix::unmarshal_raw(simcall->args[4]); } -static inline void simcall_comm_send__set__src_buff(smx_simcall_t simcall, void* arg) +static inline void simcall_comm_send__set__src_buff(smx_simcall_t simcall, unsigned char* arg) { - simgrid::simix::marshal(simcall->args[4], arg); + simgrid::simix::marshal(simcall->args[4], arg); } static inline size_t simcall_comm_send__get__src_buff_size(smx_simcall_t simcall) { @@ -312,17 +309,17 @@ static inline void simcall_comm_isend__set__rate(smx_simcall_t simcall, double a { simgrid::simix::marshal(simcall->args[3], arg); } -static inline void* simcall_comm_isend__get__src_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_isend__get__src_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->args[4]); + return simgrid::simix::unmarshal(simcall->args[4]); } -static inline void* simcall_comm_isend__getraw__src_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_isend__getraw__src_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[4]); + return simgrid::simix::unmarshal_raw(simcall->args[4]); } -static inline void simcall_comm_isend__set__src_buff(smx_simcall_t simcall, void* arg) +static inline void simcall_comm_isend__set__src_buff(smx_simcall_t simcall, unsigned char* arg) { - simgrid::simix::marshal(simcall->args[4], arg); + simgrid::simix::marshal(simcall->args[4], arg); } static inline size_t simcall_comm_isend__get__src_buff_size(smx_simcall_t simcall) { @@ -384,17 +381,17 @@ static inline void simcall_comm_isend__set__data(smx_simcall_t simcall, void* ar { simgrid::simix::marshal(simcall->args[9], arg); } -static inline int simcall_comm_isend__get__detached(smx_simcall_t simcall) +static inline bool simcall_comm_isend__get__detached(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->args[10]); + return simgrid::simix::unmarshal(simcall->args[10]); } -static inline int simcall_comm_isend__getraw__detached(smx_simcall_t simcall) +static inline bool simcall_comm_isend__getraw__detached(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[10]); + return simgrid::simix::unmarshal_raw(simcall->args[10]); } -static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int arg) +static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, bool arg) { - simgrid::simix::marshal(simcall->args[10], arg); + simgrid::simix::marshal(simcall->args[10], arg); } static inline boost::intrusive_ptr simcall_comm_isend__get__result(smx_simcall_t simcall) { @@ -433,17 +430,17 @@ static inline void simcall_comm_recv__set__mbox(smx_simcall_t simcall, smx_mailb { simgrid::simix::marshal(simcall->args[1], arg); } -static inline void* simcall_comm_recv__get__dst_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_recv__get__dst_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->args[2]); + return simgrid::simix::unmarshal(simcall->args[2]); } -static inline void* simcall_comm_recv__getraw__dst_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_recv__getraw__dst_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[2]); + return simgrid::simix::unmarshal_raw(simcall->args[2]); } -static inline void simcall_comm_recv__set__dst_buff(smx_simcall_t simcall, void* arg) +static inline void simcall_comm_recv__set__dst_buff(smx_simcall_t simcall, unsigned char* arg) { - simgrid::simix::marshal(simcall->args[2], arg); + simgrid::simix::marshal(simcall->args[2], arg); } static inline size_t* simcall_comm_recv__get__dst_buff_size(smx_simcall_t simcall) { @@ -542,17 +539,17 @@ static inline void simcall_comm_irecv__set__mbox(smx_simcall_t simcall, smx_mail { simgrid::simix::marshal(simcall->args[1], arg); } -static inline void* simcall_comm_irecv__get__dst_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_irecv__get__dst_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->args[2]); + return simgrid::simix::unmarshal(simcall->args[2]); } -static inline void* simcall_comm_irecv__getraw__dst_buff(smx_simcall_t simcall) +static inline unsigned char* simcall_comm_irecv__getraw__dst_buff(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[2]); + return simgrid::simix::unmarshal_raw(simcall->args[2]); } -static inline void simcall_comm_irecv__set__dst_buff(smx_simcall_t simcall, void* arg) +static inline void simcall_comm_irecv__set__dst_buff(smx_simcall_t simcall, unsigned char* arg) { - simgrid::simix::marshal(simcall->args[2], arg); + simgrid::simix::marshal(simcall->args[2], arg); } static inline size_t* simcall_comm_irecv__get__dst_buff_size(smx_simcall_t simcall) { @@ -627,19 +624,17 @@ static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, boost: simgrid::simix::marshal>(simcall->result, result); } -static inline boost::intrusive_ptr* -simcall_comm_waitany__get__comms(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl** simcall_comm_waitany__get__comms(smx_simcall_t simcall) { - return simgrid::simix::unmarshal*>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl** simcall_comm_waitany__getraw__comms(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl** simcall_comm_waitany__getraw__comms(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + return simgrid::simix::unmarshal_raw(simcall->args[0]); } -static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, - boost::intrusive_ptr* arg) +static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl** arg) { - simgrid::simix::marshal*>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } static inline size_t simcall_comm_waitany__get__count(smx_simcall_t simcall) { @@ -678,17 +673,17 @@ static inline void simcall_comm_waitany__set__result(smx_simcall_t simcall, int simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr simcall_comm_wait__get__comm(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl* simcall_comm_wait__get__comm(smx_simcall_t simcall) { - return simgrid::simix::unmarshal>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_wait__getraw__comm(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl* simcall_comm_wait__getraw__comm(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + 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, simgrid::kernel::activity::CommImpl* arg) { - simgrid::simix::marshal>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } static inline double simcall_comm_wait__get__timeout(smx_simcall_t simcall) { @@ -703,42 +698,42 @@ 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 simgrid::kernel::activity::CommImpl* simcall_comm_test__get__comm(smx_simcall_t simcall) { - return simgrid::simix::unmarshal>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl* simcall_comm_test__getraw__comm(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl* simcall_comm_test__getraw__comm(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + 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, simgrid::kernel::activity::CommImpl* arg) { - simgrid::simix::marshal>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } -static inline int simcall_comm_test__get__result(smx_simcall_t simcall) +static inline bool simcall_comm_test__get__result(smx_simcall_t simcall) { - return simgrid::simix::unmarshal(simcall->result); + return simgrid::simix::unmarshal(simcall->result); } -static inline int simcall_comm_test__getraw__result(smx_simcall_t simcall) +static inline bool simcall_comm_test__getraw__result(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->result); + return simgrid::simix::unmarshal_raw(simcall->result); } -static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int result) +static inline void simcall_comm_test__set__result(smx_simcall_t simcall, bool result) { - simgrid::simix::marshal(simcall->result, result); + simgrid::simix::marshal(simcall->result, result); } -static inline boost::intrusive_ptr* simcall_comm_testany__get__comms(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl** simcall_comm_testany__get__comms(smx_simcall_t simcall) { - return simgrid::simix::unmarshal*>(simcall->args[0]); + return simgrid::simix::unmarshal(simcall->args[0]); } -static inline simgrid::kernel::activity::ActivityImpl** simcall_comm_testany__getraw__comms(smx_simcall_t simcall) +static inline simgrid::kernel::activity::CommImpl** simcall_comm_testany__getraw__comms(smx_simcall_t simcall) { - return simgrid::simix::unmarshal_raw(simcall->args[0]); + 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, simgrid::kernel::activity::CommImpl** arg) { - simgrid::simix::marshal*>(simcall->args[0], arg); + simgrid::simix::marshal(simcall->args[0], arg); } static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall) { @@ -1033,20 +1028,29 @@ static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::f 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 void simcall_HANDLER_execution_wait(smx_simcall_t simcall, boost::intrusive_ptr execution); -XBT_PRIVATE void -simcall_HANDLER_execution_test(smx_simcall_t simcall, - boost::intrusive_ptr execution); -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 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 void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, - boost::intrusive_ptr* comms, - size_t count, 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_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execution); +XBT_PRIVATE void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* execution); +XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sender, smx_mailbox_t mbox, + double task_size, double rate, unsigned char* 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, + unsigned char* 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, + bool detached); +XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, + unsigned char* 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, unsigned char* 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, simgrid::kernel::activity::CommImpl** comms, size_t count, double timeout); +XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm, double timeout); +XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm); +XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl** 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);