X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3157f525692738e7d8c57543ce66ad9424973558..69659a8281d4aeac3476820299f26a09dd285996:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index ee6c0f6d73..4a2938abdb 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -10,76 +10,39 @@ /* 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 "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ConditionVariableImpl.hpp" -#include "src/kernel/activity/MutexImpl.hpp" -#include "src/kernel/activity/SemaphoreImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "src/mc/mc_replay.hpp" -#include "xbt/random.hpp" -#include +#include -#include "popping_bodies.cpp" +#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v335) +#include -#include -#include -#include +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, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), +void simcall_comm_send(simgrid::kernel::actor::ActorImpl* sender, simgrid::kernel::activity::MailboxImpl* mbox, + double task_size, double rate, void* src_buff, 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) + 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, and wants comm to be nullptr during the simcall */ - simgrid::kernel::activity::ActivityImplPtr comm = nullptr; - - simgrid::kernel::actor::CommIsendSimcall send_observer{ - sender, mbox, task_size, rate, static_cast(src_buff), src_buff_size, match_fun, - nullptr, copy_data_fun, data, false}; - comm = simgrid::kernel::actor::simcall( - [&send_observer] { return simgrid::kernel::activity::CommImpl::isend(&send_observer); }, &send_observer); - - simgrid::kernel::actor::ActivityWaitSimcall wait_observer{sender, comm.get(), timeout}; - if (simgrid::kernel::actor::simcall_blocking( - [&wait_observer] { - wait_observer.get_activity()->wait_for(wait_observer.get_issuer(), wait_observer.get_timeout()); - }, - &wait_observer)) { - throw simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"); - } - comm = nullptr; - } - else { - simgrid::kernel::actor::CommIsendSimcall observer(sender, mbox, task_size, rate, - static_cast(src_buff), src_buff_size, match_fun, - nullptr, copy_data_fun, data, false); - simgrid::kernel::actor::simcall_blocking([&observer, timeout] { - simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::isend(&observer); - comm->wait_for(observer.get_issuer(), 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 */ 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) +simcall_comm_isend(simgrid::kernel::actor::ActorImpl* sender, simgrid::kernel::activity::MailboxImpl* 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!"); @@ -90,61 +53,40 @@ simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, dou 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([&observer] { return simgrid::kernel::activity::CommImpl::isend(&observer); }); + 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, +void simcall_comm_recv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::kernel::activity::MailboxImpl* 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 timeout, double rate) + 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, and wants comm to be nullptr during the simcall */ - simgrid::kernel::activity::ActivityImplPtr comm = nullptr; - - simgrid::kernel::actor::CommIrecvSimcall observer{ - receiver, mbox, static_cast(dst_buff), dst_buff_size, match_fun, copy_data_fun, data, rate}; - comm = simgrid::kernel::actor::simcall( - [&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); }, &observer); - - simgrid::kernel::actor::ActivityWaitSimcall wait_observer{receiver, comm.get(), timeout}; - if (simgrid::kernel::actor::simcall_blocking( - [&wait_observer] { - wait_observer.get_activity()->wait_for(wait_observer.get_issuer(), wait_observer.get_timeout()); - }, - &wait_observer)) { - throw simgrid::TimeoutException(XBT_THROW_POINT, "Timeouted"); - } - comm = nullptr; - } - else { - simgrid::kernel::actor::CommIrecvSimcall observer(receiver, mbox, static_cast(dst_buff), - dst_buff_size, match_fun, copy_data_fun, data, rate); - simgrid::kernel::actor::simcall_blocking([&observer, timeout] { - simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::irecv(&observer); - comm->wait_for(observer.get_issuer(), timeout); - }); - } + 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 */ simgrid::kernel::activity::ActivityImplPtr -simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, +simcall_comm_irecv(simgrid::kernel::actor::ActorImpl* receiver, simgrid::kernel::activity::MailboxImpl* 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) + 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 irecv"); 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([&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); }); + return simgrid::kernel::actor::simcall_answered( + [&observer] { return simgrid::kernel::activity::CommImpl::irecv(&observer); }); } /** @@ -153,7 +95,20 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz 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, count, 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; } /** @@ -182,12 +137,10 @@ ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_ /** * @ingroup simix_comm_management */ -void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* 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!"); - simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); - simgrid::kernel::actor::simcall_blocking([issuer, comm, timeout] { comm->wait_for(issuer, timeout); }); } @@ -207,49 +160,32 @@ bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) // XBT_ATT return false; } -void simcall_run_kernel(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) -{ - simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; - simcall_BODY_run_kernel(&code); - simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; -} - -void simcall_run_blocking(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) +static void simcall(simgrid::kernel::actor::Simcall::Type call, std::function const& code, + simgrid::kernel::actor::SimcallObserver* observer) { - simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; - simcall_BODY_run_blocking(&code); - simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; -} - -/* ************************************************************************** */ - -/** @brief returns a printable string representing a simcall */ -const char* SIMIX_simcall_name(const s_smx_simcall& simcall) -{ - if (simcall.observer_ != nullptr) { -#if SIMGRID_HAVE_MC - if (mc_model_checker != nullptr) // Do not try to use the observer from the MCer - return "(remotely observed)"; -#endif - - static std::string name; - name = boost::core::demangle(typeid(*simcall.observer_).name()); - const char* cname = name.c_str(); - if (name.rfind("simgrid::kernel::", 0) == 0) - cname += 17; // strip prefix "simgrid::kernel::" - return cname; + auto self = simgrid::kernel::actor::ActorImpl::self(); + self->simcall_.call_ = call; + self->simcall_.code_ = &code; + self->simcall_.observer_ = observer; + if (simgrid::kernel::EngineImpl::get_instance()->is_maestro(self)) { + self->simcall_handle(0); } else { - return simcall_names.at(static_cast(simcall.call_)); + XBT_DEBUG("Yield process '%s' on simcall %s", self->get_cname(), self->simcall_.get_cname()); + self->yield(); } + self->simcall_.observer_ = nullptr; } -namespace simgrid { -namespace simix { +void simcall_run_answered(std::function const& code, simgrid::kernel::actor::SimcallObserver* 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, observer); +} -void unblock(smx_actor_t actor) +void simcall_run_blocking(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) { - xbt_assert(s4u::Actor::is_maestro()); - actor->simcall_answer(); + // 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, observer); } -} // namespace simix -} // namespace simgrid