X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4d38cfaf4833e416c72a7ca427dd5cd6a0af2e2..92cd12d0b61dd5a17500ef7d38f7b95a80301037:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index fadbc6425a..4a0aa0ef46 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -16,99 +16,48 @@ #include "src/kernel/activity/ConditionVariableImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/IoImpl.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_io_private.hpp" - -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -/** - * @ingroup simix_process_management - * @brief Creates a synchro that may involve parallel computation on - * several hosts and communication between them. - * - * @param name Name of the execution synchro to create - * @param host_nb Number of hosts where the synchro will be executed - * @param host_list Array (of size host_nb) of hosts where the synchro will be executed - * @param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes) - * @param bytes_amount Array (of size host_nb * host_nb) representing the communication - * amount between each pair of hosts - * @param rate the SURF action rate - * @param timeout timeout - * @return A new SIMIX execution synchronization - */ -smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, - double* flops_amount, double* bytes_amount, double rate, double timeout) -{ - /* 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!"); - - 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); - }); -} - /** * @ingroup simix_host_management * @brief Waits for the completion of an execution synchro and destroy it. * * @param execution The execution synchro */ -e_smx_state_t simcall_execution_wait(smx_activity_t execution) +e_smx_state_t simcall_execution_wait(const smx_activity_t& execution) { - return (e_smx_state_t) simcall_BODY_execution_wait(execution); + return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get())); } -e_smx_state_t simcall_execution_test(smx_activity_t execution) +bool simcall_execution_test(const smx_activity_t& execution) { - return (e_smx_state_t)simcall_BODY_execution_test(execution); + return simcall_BODY_execution_test(static_cast(execution.get())); +} + +unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout) +{ + return simcall_BODY_execution_waitany_for(execs, count, timeout); } void simcall_process_join(smx_actor_t process, double timeout) { - simcall_BODY_process_join(process, timeout); + SIMIX_process_self()->join(process, timeout); } -/** - * @ingroup simix_process_management - * @brief Suspends an actor - */ void simcall_process_suspend(smx_actor_t process) { - simcall_BODY_process_suspend(process); + SIMIX_process_self()->iface()->suspend(); } -/** - * @ingroup simix_process_management - * @brief Creates a new sleep SIMIX synchro. - * - * This function creates a SURF action and allocates the data necessary - * to create the SIMIX synchro. It can raise a HostFailureException if the - * host crashed. The default SIMIX name of the synchro is "sleep". - * - * @param duration Time duration of the sleep. - * @return A result telling whether the sleep was successful - */ e_smx_state_t simcall_process_sleep(double duration) { - /* checking for infinite values */ - xbt_assert(std::isfinite(duration), "duration is not finite!"); - return (e_smx_state_t) simcall_BODY_process_sleep(duration); + SIMIX_process_self()->sleep(duration); + return SIMIX_DONE; } /** @@ -116,7 +65,8 @@ e_smx_state_t simcall_process_sleep(double duration) */ 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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout) + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, + double timeout) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -134,8 +84,8 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, comm = nullptr; } else { - simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size, - match_fun, copy_data_fun, data, timeout); + simcall_BODY_comm_send(sender, mbox, task_size, rate, static_cast(src_buff), src_buff_size, + match_fun, copy_data_fun, data, timeout); } } @@ -145,8 +95,9 @@ 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*), - void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t), - void* data, int detached) + void (*clean_fun)(void*), + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, bool detached) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -154,9 +105,8 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double xbt_assert(mbox, "No rendez-vous point defined for isend"); - return simcall_BODY_comm_isend(sender, mbox, task_size, rate, src_buff, - src_buff_size, match_fun, - clean_fun, copy_data_fun, data, detached); + return simcall_BODY_comm_isend(sender, mbox, task_size, rate, static_cast(src_buff), src_buff_size, + match_fun, clean_fun, copy_data_fun, data, detached); } /** @@ -164,7 +114,8 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double */ 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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout, double rate) + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, + double timeout, double rate) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); xbt_assert(mbox, "No rendez-vous point defined for recv"); @@ -178,8 +129,8 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, comm = nullptr; } else { - simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, timeout, rate); + simcall_BODY_comm_recv(receiver, mbox, static_cast(dst_buff), dst_buff_size, match_fun, + copy_data_fun, data, timeout, rate); } } /** @@ -187,12 +138,13 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, */ 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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate) + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, double rate) { xbt_assert(mbox, "No rendez-vous point defined for irecv"); - return simcall_BODY_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, rate); + return simcall_BODY_comm_irecv(receiver, mbox, static_cast(dst_buff), dst_buff_size, match_fun, + copy_data_fun, data, rate); } /** @@ -203,21 +155,41 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); - return simcall_BODY_comm_iprobe(mbox, type, match_fun, data); + return simgrid::kernel::actor::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); } /** * @ingroup simix_comm_management */ -unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) +unsigned int simcall_comm_waitany(smx_activity_t comms[], size_t count, double timeout) +{ + std::unique_ptr rcomms(new simgrid::kernel::activity::CommImpl*[count]); + std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) { + return static_cast(comm.get()); + }); + return simcall_BODY_comm_waitany(rcomms.get(), count, timeout); +} + +unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout) { - return simcall_BODY_comm_waitany(comms, timeout); + return simcall_BODY_comm_waitany(comms, count, timeout); } /** * @ingroup simix_comm_management */ -int simcall_comm_testany(smx_activity_t* comms, size_t count) +int simcall_comm_testany(smx_activity_t comms[], size_t count) +{ + if (count == 0) + return -1; + std::unique_ptr rcomms(new simgrid::kernel::activity::CommImpl*[count]); + std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) { + return static_cast(comm.get()); + }); + return simcall_BODY_comm_testany(rcomms.get(), count); +} + +int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) { if (count == 0) return -1; @@ -227,19 +199,19 @@ int simcall_comm_testany(smx_activity_t* comms, size_t count) /** * @ingroup simix_comm_management */ -void simcall_comm_wait(smx_activity_t comm, double timeout) +void simcall_comm_wait(const smx_activity_t& comm, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_comm_wait(comm, timeout); + simcall_BODY_comm_wait(static_cast(comm.get()), timeout); } /** * @ingroup simix_comm_management * */ -int simcall_comm_test(smx_activity_t comm) +bool simcall_comm_test(const smx_activity_t& comm) { - return simcall_BODY_comm_test(comm); + return simcall_BODY_comm_test(static_cast(comm.get())); } /** @@ -253,7 +225,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(); }); } /** @@ -289,7 +261,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(); }); } /** @@ -330,9 +302,9 @@ 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(smx_activity_t io) +e_smx_state_t simcall_io_wait(const smx_activity_t& io) { - return (e_smx_state_t)simcall_BODY_io_wait(io); + return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get())); } void simcall_run_kernel(std::function const& code) @@ -359,10 +331,10 @@ const char *SIMIX_simcall_name(e_smx_simcall_t kind) { namespace simgrid { namespace simix { -void unblock(smx_actor_t process) +void unblock(smx_actor_t actor) { xbt_assert(SIMIX_is_maestro()); - SIMIX_simcall_answer(&process->simcall); + actor->simcall_answer(); } } // namespace simix } // namespace simgrid @@ -370,36 +342,90 @@ void unblock(smx_actor_t process) /* ****************************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); }); + simgrid::kernel::actor::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(); }); + simgrid::kernel::actor::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_priority(smx_activity_t exec, double priority) -{ - simgrid::simix::simcall([exec, priority] { - boost::static_pointer_cast(exec)->set_priority(priority); - }); + simgrid::kernel::actor::simcall( + [exec] { boost::static_pointer_cast(exec)->cancel(); }); } void simcall_execution_set_bound(smx_activity_t exec, double bound) { - simgrid::simix::simcall( + simgrid::kernel::actor::simcall( [exec, bound] { boost::static_pointer_cast(exec)->set_bound(bound); }); } -smx_activity_t simcall_execution_start(std::string name, std::string category, double flops_amount, double priority, - double bound, sg_host_t host) +// 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::kernel::actor::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) { - return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { - simgrid::kernel::activity::ExecImplPtr exec = - simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, category, nullptr, host)); - exec->start(flops_amount, priority, bound); - return exec; + /* 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::kernel::actor::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(); +}