From: Frederic Suter Date: Wed, 3 Apr 2019 10:36:42 +0000 (+0200) Subject: simcall_execution_test returns a bool not a state X-Git-Tag: v3.22.1~9 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cdef428603e68472f5999bdcc382748f8eb5b7de?ds=sidebyside simcall_execution_test returns a bool not a state --- diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 8034635948..e5f195f969 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -180,7 +180,7 @@ XBT_ATTRIB_DEPRECATED_v325("Please use CommImpl::finish()") XBT_PUBLIC void SIMI /******************************* Host simcalls ********************************/ #ifdef __cplusplus XBT_PUBLIC e_smx_state_t simcall_execution_wait(const smx_activity_t& execution); -XBT_PUBLIC e_smx_state_t simcall_execution_test(const smx_activity_t& execution); +XBT_PUBLIC bool simcall_execution_test(const smx_activity_t& execution); #endif /**************************** Process simcalls ********************************/ diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index 5c12267a8e..a2ca6a8f6e 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -37,7 +37,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro) { - int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); + bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); if (res) { synchro->simcalls_.push_back(simcall); synchro->finish(); diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index cd27911cc6..7116fb0027 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -36,9 +36,9 @@ e_smx_state_t simcall_execution_wait(const smx_activity_t& execution) return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get())); } -e_smx_state_t simcall_execution_test(const smx_activity_t& execution) +bool simcall_execution_test(const smx_activity_t& execution) { - return (e_smx_state_t)simcall_BODY_execution_test(static_cast(execution.get())); + return simcall_BODY_execution_test(static_cast(execution.get())); } void simcall_process_join(smx_actor_t process, double timeout) diff --git a/src/simix/popping_accessors.hpp b/src/simix/popping_accessors.hpp index e4dc4f0c3e..32af6e3504 100644 --- a/src/simix/popping_accessors.hpp +++ b/src/simix/popping_accessors.hpp @@ -127,17 +127,17 @@ static inline void simcall_execution_test__set__execution(smx_simcall_t simcall, { 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) diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 4234bb929c..06549e00ea 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -64,11 +64,11 @@ inline static int simcall_BODY_execution_wait(simgrid::kernel::activity::ExecImp return simcall(SIMCALL_EXECUTION_WAIT, execution); } -inline static int simcall_BODY_execution_test(simgrid::kernel::activity::ExecImpl* execution) +inline static bool simcall_BODY_execution_test(simgrid::kernel::activity::ExecImpl* execution) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ simcall_HANDLER_execution_test(&SIMIX_process_self()->simcall, execution); - return simcall(SIMCALL_EXECUTION_TEST, execution); + return simcall(SIMCALL_EXECUTION_TEST, execution); } 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) diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index 5eeaa1a3d8..abcd76ebc3 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -40,7 +40,7 @@ int process_join(smx_actor_t process, double timeout) [[block]]; int process_sleep(double duration) [[block]]; int execution_wait(simgrid::kernel::activity::ExecImpl* execution) [[block]]; -int execution_test(simgrid::kernel::activity::ExecImpl* execution) [[block]]; +bool execution_test(simgrid::kernel::activity::ExecImpl* execution) [[block]]; void 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) [[block]]; boost::intrusive_ptr 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, bool detached);