X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/acd555b41f9a71f6e3ed538f00d1e84fe6d19024..a784ea0b57101613a92e9fe1403d224e7ea4d501:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 0e3ba0c89b..c05655a657 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -208,20 +208,6 @@ void simcall_process_suspend(smx_actor_t process) simcall_BODY_process_suspend(process); } -/** - * \ingroup simix_process_management - * \brief Resumes a suspended process. - * - * This function resumes a suspended process by resuming the synchro - * it was waiting for completion. - * - * \param process a SIMIX process - */ -void simcall_process_resume(smx_actor_t process) -{ - simcall_BODY_process_resume(process); -} - /** * \ingroup simix_process_management * \brief Returns the amount of SIMIX processes in the system @@ -243,7 +229,7 @@ int simcall_process_count() */ void simcall_process_set_data(smx_actor_t process, void *data) { - simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data)); + simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); }); } /** @@ -255,29 +241,22 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr) return; - XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->cname()); + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->getCname()); process->kill_timer = SIMIX_timer_set(kill_time, [=] { simix_global->kill_process_function(process); process->kill_timer=nullptr; }); } -/** - * \ingroup simix_process_management - * \brief Get the kill time of a process (or 0 if unset). - */ -double simcall_process_get_kill_time(smx_actor_t process) { - return SIMIX_timer_get_date(process->kill_timer); -} /** * \ingroup simix_process_management * \brief Return the properties * - * This functions returns the properties associated with this process + * This function returns the properties associated with this process */ xbt_dict_t simcall_process_get_properties(smx_actor_t process) { - return SIMIX_process_get_properties(process); + return process->properties; } /** * \ingroup simix_process_management @@ -412,12 +391,12 @@ smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void /** * \ingroup simix_comm_management */ -smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, +smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); - return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data); + return simcall_BODY_comm_iprobe(mbox, type, match_fun, data); } /**