X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f063625862eb4dfe006653ce98a4291fb4c1810e..e04e3ae8fec7cb28eef7705e4aebf2370e6fdd6a:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 70b401484e..9410c2fcd1 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -29,9 +29,10 @@ * * @param execution The execution synchro */ -e_smx_state_t simcall_execution_wait(const smx_activity_t& execution) +e_smx_state_t simcall_execution_wait(const smx_activity_t& execution, double timeout) { - return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get())); + return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get()), + timeout); } bool simcall_execution_test(const smx_activity_t& execution) @@ -44,27 +45,27 @@ unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* return simcall_BODY_execution_waitany_for(execs, count, timeout); } -void simcall_process_join(smx_actor_t process, double timeout) +void simcall_process_join(smx_actor_t process, double timeout) // XBT_DEPRECATED_v328 { - SIMIX_process_self()->join(process, timeout); + simgrid::kernel::actor::ActorImpl::self()->join(process, timeout); } -void simcall_process_suspend(smx_actor_t process) +void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328 { - SIMIX_process_self()->iface()->suspend(); + process->iface()->suspend(); } -e_smx_state_t simcall_process_sleep(double duration) +e_smx_state_t simcall_process_sleep(double duration) // XBT_DEPRECATED_v329 { - SIMIX_process_self()->sleep(duration); - return SIMIX_DONE; + simgrid::kernel::actor::ActorImpl::self()->sleep(duration); + return simgrid::kernel::activity::State::DONE; } /** * @ingroup simix_comm_management */ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, - size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + size_t src_buff_size, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout) { @@ -94,7 +95,7 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, */ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, bool detached) @@ -113,7 +114,7 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double * @ingroup simix_comm_management */ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout, double rate) { @@ -137,7 +138,7 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, * @ingroup simix_comm_management */ smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double rate) { @@ -151,11 +152,11 @@ 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 (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); - return simgrid::simix::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); + return simgrid::kernel::actor::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); } /** @@ -225,7 +226,7 @@ smx_mutex_t simcall_mutex_init() // get there before the initialization xbt_abort(); } - return simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); + return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); } /** @@ -261,7 +262,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex) */ smx_cond_t simcall_cond_init() { - return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); + return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** @@ -302,18 +303,25 @@ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) return simcall_BODY_sem_acquire_timeout(sem, timeout); } -e_smx_state_t simcall_io_wait(const smx_activity_t& io) +e_smx_state_t simcall_io_wait(const smx_activity_t& io, double timeout) { - return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get())); + return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get()), timeout); } -void simcall_run_kernel(std::function const& code) +bool simcall_io_test(const smx_activity_t& io) { + return simcall_BODY_io_test(static_cast(io.get())); +} + +void simcall_run_kernel(std::function const& code, simgrid::mc::SimcallInspector* t) +{ + simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; simcall_BODY_run_kernel(&code); } -void simcall_run_blocking(std::function const& code) +void simcall_run_blocking(std::function const& code, simgrid::mc::SimcallInspector* t = nullptr) { + simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; simcall_BODY_run_blocking(&code); } @@ -338,92 +346,3 @@ void unblock(smx_actor_t actor) } } // namespace simix } // namespace simgrid - -/* ****************************DEPRECATED CALLS******************************* */ -void simcall_process_set_kill_time(smx_actor_t process, double kill_time) -{ - simgrid::simix::simcall([process, kill_time] { process->set_kill_time(kill_time); }); -} -void simcall_comm_cancel(smx_activity_t comm) -{ - simgrid::simix::simcall([comm] { boost::static_pointer_cast(comm)->cancel(); }); -} -void simcall_execution_cancel(smx_activity_t exec) -{ - simgrid::simix::simcall([exec] { boost::static_pointer_cast(exec)->cancel(); }); -} - -void simcall_execution_set_bound(smx_activity_t exec, double bound) -{ - simgrid::simix::simcall( - [exec, bound] { boost::static_pointer_cast(exec)->set_bound(bound); }); -} - -// deprecated -smx_activity_t simcall_execution_start(const std::string& name, const std::string& category, double flops_amount, - double sharing_penalty, double bound, sg_host_t host) -{ - return simgrid::simix::simcall([name, category, flops_amount, sharing_penalty, bound, host] { - simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl(); - (*exec) - .set_name(name) - .set_tracing_category(category) - .set_host(host) - .set_sharing_penalty(sharing_penalty) - .set_bound(bound) - .set_flops_amount(flops_amount) - .start(); - return simgrid::kernel::activity::ExecImplPtr(exec); - }); -} - -// deprecated -smx_activity_t simcall_execution_parallel_start(const std::string& name, int host_nb, const sg_host_t* host_list, - const double* flops_amount, const double* bytes_amount, double rate, - double timeout) -{ - /* Check that we are not mixing VMs and PMs in the parallel task */ - bool is_a_vm = (nullptr != dynamic_cast(host_list[0])); - for (int i = 1; i < host_nb; i++) { - bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i])); - xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet)."); - } - - /* checking for infinite values */ - for (int i = 0; i < host_nb; ++i) { - if (flops_amount != nullptr) - xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); - if (bytes_amount != nullptr) { - for (int j = 0; j < host_nb; ++j) { - xbt_assert(std::isfinite(bytes_amount[i + host_nb * j]), "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, - j); - } - } - } - xbt_assert(std::isfinite(rate), "rate is not finite!"); - - std::vector hosts(host_list, host_list + host_nb); - std::vector flops_parallel_amount; - std::vector bytes_parallel_amount; - if (flops_amount != nullptr) - flops_parallel_amount = std::vector(flops_amount, flops_amount + host_nb); - if (bytes_amount != nullptr) - bytes_parallel_amount = std::vector(bytes_amount, bytes_amount + host_nb * host_nb); - return simgrid::simix::simcall([name, hosts, flops_parallel_amount, bytes_parallel_amount, timeout] { - simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl(); - (*exec) - .set_name(name) - .set_hosts(hosts) - .set_timeout(timeout) - .set_flops_amounts(flops_parallel_amount) - .set_bytes_amounts(bytes_parallel_amount) - .start(); - return simgrid::kernel::activity::ExecImplPtr(exec); - }); -} - -// deprecated -void SIMIX_comm_finish(smx_activity_t synchro) -{ - boost::static_pointer_cast(synchro)->finish(); -}