X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e22677c69b378a88eff7dd09695772134112dcf1..9e34d715bca0465a05c87301f6d0238d1a516c74:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 87f6b58273..402d188628 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,151 +5,42 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "mc/mc.h" -#include "simgrid/simix/blocking_simcall.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/kernel/activity/IoImpl.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" -#include "src/simix/smx_network_private.hpp" +#include "src/kernel/actor/SimcallObserver.hpp" +#include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); +#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v335) +#include -#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(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) -{ - /* 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(std::move(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) -{ - return (e_smx_state_t) simcall_BODY_execution_wait(execution); -} - -e_smx_state_t simcall_execution_test(smx_activity_t execution) -{ - return (e_smx_state_t)simcall_BODY_execution_test(execution); -} - -void simcall_process_join(smx_actor_t process, double timeout) -{ - simcall_BODY_process_join(process, timeout); -} - -/** - * @ingroup simix_process_management - * @brief Suspends an actor - */ -void simcall_process_suspend(smx_actor_t process) -{ - simcall_BODY_process_suspend(process); -} - -/** - * @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); -} +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_simcall); /** * @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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout) + 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) // XBT_ATTRIB_DEPRECATED_v335 { - /* checking for infinite values */ - xbt_assert(std::isfinite(task_size), "task_size is not finite!"); - xbt_assert(std::isfinite(rate), "rate is not finite!"); - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - xbt_assert(mbox, "No rendez-vous point defined for send"); - - if (MC_is_active() || MC_record_replay_is_active()) { - /* the model-checker wants two separate simcalls */ - smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ - comm = simcall_comm_isend(sender, mbox, task_size, rate, - src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); - simcall_comm_wait(comm, timeout); - comm = nullptr; - } - else { - simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size, - match_fun, copy_data_fun, data, timeout); - } + simgrid::s4u::Comm::send(sender, mbox->get_iface(), task_size, rate, src_buff, src_buff_size, match_fun, + copy_data_fun, data, timeout); } /** * @ingroup simix_comm_management */ -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) +simgrid::kernel::activity::ActivityImplPtr +simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, + size_t src_buff_size, 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) // XBT_ATTRIB_DEPRECATED_v335 { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -157,252 +48,141 @@ 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); + simgrid::kernel::actor::CommIsendSimcall observer(sender, mbox, task_size, rate, + static_cast(src_buff), src_buff_size, match_fun, + clean_fun, copy_data_fun, data, detached); + return simgrid::kernel::actor::simcall_answered( + [&observer] { return simgrid::kernel::activity::CommImpl::isend(&observer); }); } /** * @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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout, double rate) + 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) // XBT_ATTRIB_DEPRECATED_v335 { - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); xbt_assert(mbox, "No rendez-vous point defined for recv"); - - if (MC_is_active() || MC_record_replay_is_active()) { - /* the model-checker wants two separate simcalls */ - smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ - comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, rate); - simcall_comm_wait(comm, timeout); - comm = nullptr; - } - else { - simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, timeout, rate); - } -} -/** - * @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*), - void (*copy_data_fun)(smx_activity_t, 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); + simgrid::s4u::Comm::recv(receiver, mbox->get_iface(), dst_buff, dst_buff_size, match_fun, copy_data_fun, data, + timeout, rate); } /** * @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) +simgrid::kernel::activity::ActivityImplPtr +simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_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 rate) // XBT_ATTRIB_DEPRECATED_v335 { - xbt_assert(mbox, "No rendez-vous point defined for iprobe"); + xbt_assert(mbox, "No rendez-vous point defined for irecv"); - return simgrid::simix::simcall( - [mbox, type, match_fun, data] { return SIMIX_comm_iprobe(mbox, type, match_fun, data); }); + simgrid::kernel::actor::CommIrecvSimcall observer(receiver, mbox, static_cast(dst_buff), + dst_buff_size, match_fun, copy_data_fun, data, rate); + return simgrid::kernel::actor::simcall_answered( + [&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); }); } /** * @ingroup simix_comm_management */ -unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) +ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, + double timeout) // XBT_ATTRIB_DEPRECATED_v335 { - return simcall_BODY_comm_waitany(comms, timeout); + std::vector activities; + for (size_t i = 0; i < count; i++) + activities.push_back(static_cast(comms[i])); + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::ActivityWaitanySimcall observer{issuer, activities, timeout}; + ssize_t changed_pos = simgrid::kernel::actor::simcall_blocking( + [&observer] { + simgrid::kernel::activity::ActivityImpl::wait_any_for(observer.get_issuer(), observer.get_activities(), + observer.get_timeout()); + }, + &observer); + if (changed_pos != -1) + activities.at(changed_pos)->get_iface()->complete(simgrid::s4u::Activity::State::FINISHED); + return changed_pos; } /** * @ingroup simix_comm_management */ -int simcall_comm_testany(smx_activity_t* comms, size_t count) +ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) // XBT_ATTRIB_DEPRECATED_v335 { if (count == 0) return -1; - return simcall_BODY_comm_testany(comms, count); + std::vector activities; + for (size_t i = 0; i < count; i++) + activities.push_back(static_cast(comms[i])); + + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::ActivityTestanySimcall observer{issuer, activities}; + ssize_t changed_pos = simgrid::kernel::actor::simcall_blocking( + [&observer] { + simgrid::kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); + }, + &observer); + if (changed_pos != -1) + comms[changed_pos]->get_iface()->complete(simgrid::s4u::Activity::State::FINISHED); + return changed_pos; } /** * @ingroup simix_comm_management */ -void simcall_comm_wait(smx_activity_t comm, double timeout) +void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double timeout) // XBT_ATTRIB_DEPRECATED_v335 { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_comm_wait(comm, timeout); + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::simcall_blocking([issuer, comm, timeout] { comm->wait_for(issuer, timeout); }); } /** * @ingroup simix_comm_management * */ -int simcall_comm_test(smx_activity_t comm) +bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) // XBT_ATTRIB_DEPRECATED_v335 { - return simcall_BODY_comm_test(comm); -} - -/** - * @ingroup simix_synchro_management - * - */ -smx_mutex_t simcall_mutex_init() -{ - if (simix_global == nullptr) { - fprintf(stderr, "You must initialize the SimGrid engine before using it\n"); // We can't use xbt_die since we may - // get there before the initialization - xbt_abort(); + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::ActivityTestSimcall observer{issuer, comm}; + if (simgrid::kernel::actor::simcall_blocking([&observer] { observer.get_activity()->test(observer.get_issuer()); }, + &observer)) { + comm->get_iface()->complete(simgrid::s4u::Activity::State::FINISHED); + return true; } - return simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); -} - -/** - * @ingroup simix_synchro_management - * - */ -void simcall_mutex_lock(smx_mutex_t mutex) -{ - simcall_BODY_mutex_lock(mutex); + return false; } -/** - * @ingroup simix_synchro_management - * - */ -int simcall_mutex_trylock(smx_mutex_t mutex) -{ - return simcall_BODY_mutex_trylock(mutex); -} - -/** - * @ingroup simix_synchro_management - * - */ -void simcall_mutex_unlock(smx_mutex_t mutex) +static void simcall(simgrid::kernel::actor::Simcall::Type call, std::function const& code) { - simcall_BODY_mutex_unlock(mutex); -} - -/** - * @ingroup simix_synchro_management - * - */ -smx_cond_t simcall_cond_init() -{ - return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); -} - -/** - * @ingroup simix_synchro_management - * - */ -void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) -{ - simcall_BODY_cond_wait(cond, mutex); -} - -/** - * @ingroup simix_synchro_management - * - */ -int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) -{ - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); -} - -/** - * @ingroup simix_synchro_management - * - */ -void simcall_sem_acquire(smx_sem_t sem) -{ - simcall_BODY_sem_acquire(sem); -} - -/** - * @ingroup simix_synchro_management - * - */ -int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) -{ - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - return simcall_BODY_sem_acquire_timeout(sem, timeout); -} - -e_smx_state_t simcall_io_wait(smx_activity_t io) -{ - return (e_smx_state_t)simcall_BODY_io_wait(io); -} - -void simcall_run_kernel(std::function const& code) -{ - simcall_BODY_run_kernel(&code); -} - -void simcall_run_blocking(std::function const& code) -{ - simcall_BODY_run_blocking(&code); -} - -int simcall_mc_random(int min, int max) { - return simcall_BODY_mc_random(min, max); -} - -/* ************************************************************************** */ - -/** @brief returns a printable string representing a simcall */ -const char *SIMIX_simcall_name(e_smx_simcall_t kind) { - return simcall_names[kind]; -} - -namespace simgrid { -namespace simix { - -void unblock(smx_actor_t process) -{ - xbt_assert(SIMIX_is_maestro()); - SIMIX_simcall_answer(&process->simcall); -} -} // 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_priority(smx_activity_t exec, double priority) -{ - simgrid::simix::simcall([exec, priority] { - boost::static_pointer_cast(exec)->set_priority(priority); - }); + auto self = simgrid::kernel::actor::ActorImpl::self(); + self->simcall_.call_ = call; + self->simcall_.code_ = &code; + if (not simgrid::kernel::EngineImpl::get_instance()->is_maestro(self)) { + XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), self->simcall_.get_cname()); + self->yield(); + } else { + self->simcall_handle(0); + } } -void simcall_execution_set_bound(smx_activity_t exec, double bound) +void simcall_run_answered(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) { - simgrid::simix::simcall( - [exec, bound] { boost::static_pointer_cast(exec)->set_bound(bound); }); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; + // The function `code` is called in kernel mode (either because we are already in maestor or after a context switch) + // and simcall_answer() is called + simcall(simgrid::kernel::actor::Simcall::Type::RUN_ANSWERED, code); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; } -smx_activity_t simcall_execution_start(const std::string& name, const std::string& category, double flops_amount, - double priority, double bound, sg_host_t host) +void simcall_run_blocking(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) { - return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { - return simgrid::kernel::activity::ExecImplPtr( - new simgrid::kernel::activity::ExecImpl(std::move(name), std::move(category), nullptr, host)) - ->start(flops_amount, priority, bound); - }); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; + // The function `code` is called in kernel mode (either because we are already in maestor or after a context switch) + // BUT simcall_answer IS NOT CALLED + simcall(simgrid::kernel::actor::Simcall::Type::RUN_BLOCKING, code); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; }