X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28cf1594ef109bb3cd215fd9b0f16a5418ca999e..bd09ae420315e4fb0d9e20749c575d17c218e5de:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index d685e4bce3..41b201c9d7 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -33,17 +33,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_actor_t actor) -{ - if (actor != simix_global->maestro_process) { - XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->get_cname(), SIMIX_simcall_name(actor->simcall.call), - (int)actor->simcall.call); - SIMIX_process_yield(actor); - } else { - SIMIX_simcall_handle(&actor->simcall, 0); - } -} - /** * \ingroup simix_process_management * \brief Creates a synchro that executes some computation of an host. @@ -65,7 +54,9 @@ smx_activity_t simcall_execution_start(const char* name, double flops_amount, do xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!"); xbt_assert(std::isfinite(priority), "priority is not finite!"); - return simcall_BODY_execution_start(name, flops_amount, priority, bound, host); + return simgrid::simix::simcall([name, flops_amount, priority, bound, host] { + return SIMIX_execution_start(name, flops_amount, priority, bound, host); + }); } /** @@ -99,7 +90,9 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s xbt_assert(std::isfinite(rate), "rate is not finite!"); - return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + return simgrid::simix::simcall([name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout] { + return SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + }); } /** @@ -113,13 +106,9 @@ void simcall_execution_cancel(smx_activity_t execution) { simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(execution); - if (not exec->surfAction_) + if (exec->surf_action_ == nullptr) // FIXME: One test fails if I remove this, but I don't get why... return; - simgrid::simix::kernelImmediate([exec] { - XBT_DEBUG("Cancel synchro %p", exec.get()); - if (exec->surfAction_) - exec->surfAction_->cancel(); - }); + simgrid::simix::simcall([exec] { exec->cancel(); }); } /** @@ -134,12 +123,11 @@ void simcall_execution_set_priority(smx_activity_t execution, double priority) { /* checking for infinite values */ xbt_assert(std::isfinite(priority), "priority is not finite!"); - simgrid::simix::kernelImmediate([execution, priority] { + simgrid::simix::simcall([execution, priority] { simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(execution); - if (exec->surfAction_) - exec->surfAction_->set_priority(priority); + exec->set_priority(priority); }); } @@ -153,11 +141,10 @@ void simcall_execution_set_priority(smx_activity_t execution, double priority) */ void simcall_execution_set_bound(smx_activity_t execution, double bound) { - simgrid::simix::kernelImmediate([execution, bound] { + simgrid::simix::simcall([execution, bound] { simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(execution); - if (exec->surfAction_) - exec->surfAction_->set_bound(bound); + exec->set_bound(bound); }); } @@ -206,7 +193,7 @@ void simcall_process_suspend(smx_actor_t process) */ void simcall_process_set_data(smx_actor_t process, void *data) { - simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); }); + simgrid::simix::simcall([process, data] { process->setUserData(data); }); } /** @@ -225,16 +212,6 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) }); } -/** - * \ingroup simix_process_management - * \brief Add an on_exit function - * Add an on_exit function which will be executed when the process exits/is killed. - */ -XBT_PUBLIC void simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) -{ - simcall_BODY_process_on_exit(process, fun, data); -} - /** * \ingroup simix_process_management * \brief Creates a new sleep SIMIX synchro. @@ -353,7 +330,7 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, */ void simcall_comm_cancel(smx_activity_t synchro) { - simgrid::simix::kernelImmediate([synchro] { + simgrid::simix::simcall([synchro] { simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); comm->cancel(); @@ -399,7 +376,7 @@ void simcall_set_category(smx_activity_t synchro, const char *category) if (category == nullptr) { return; } - simcall_BODY_set_category(synchro, category); + simgrid::simix::simcall([synchro, category] { SIMIX_set_category(synchro, category); }); } /** @@ -421,7 +398,7 @@ smx_mutex_t simcall_mutex_init() fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization xbt_abort(); } - return simgrid::simix::kernelImmediate([] { return new simgrid::kernel::activity::MutexImpl(); }); + return simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); } /** @@ -457,7 +434,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex) */ smx_cond_t simcall_cond_init() { - return simcall_BODY_cond_init(); + return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** @@ -473,10 +450,10 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) * \ingroup simix_synchro_management * */ -void simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) +int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_cond_wait_timeout(cond, mutex, timeout); + return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); } /** @@ -492,10 +469,10 @@ void simcall_sem_acquire(smx_sem_t sem) * \ingroup simix_synchro_management * */ -void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) +int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_sem_acquire_timeout(sem, timeout); + return simcall_BODY_sem_acquire_timeout(sem, timeout); } sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size)