X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb305a8cc20cc267f909dca81b06a7036f3bc639..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index edfd15cfb2..19ff81c784 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -1,29 +1,23 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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/Exception.hpp" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Exec.hpp" +#include +#include +#include + #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/kernel/activity/IoImpl.hpp" -#include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" -#include "src/mc/mc_replay.hpp" -#include "src/mc/remote/AppSide.hpp" -#include "src/simix/smx_private.hpp" +#if HAVE_SMPI +#include "src/smpi/include/private.hpp" +#endif #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" #include #include #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side"); /** * @brief Returns the current agent. @@ -32,7 +26,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX * * @return The SIMIX process */ -smx_actor_t SIMIX_process_self() +smx_actor_t SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333 { return simgrid::kernel::actor::ActorImpl::self(); } @@ -66,12 +60,12 @@ ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std { pid_ = maxpid++; simcall_.issuer_ = this; - stacksize_ = smx_context_stack_size; + stacksize_ = context::stack_size; } ActorImpl::~ActorImpl() { - if (simix_global != nullptr && not simix_global->is_maestro(this)) + if (EngineImpl::has_instance() && not EngineImpl::get_instance()->is_maestro(this)) s4u::Actor::on_destruction(*get_ciface()); } @@ -96,12 +90,11 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h auto* actor = new ActorImpl(xbt::string(name), host); /* Actor data */ - actor->set_user_data(data); + actor->piface_.set_data(data); actor->code_ = nullptr; XBT_VERB("Create context %s", actor->get_cname()); - xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first"); - actor->context_.reset(simix_global->get_context_factory()->attach(actor)); + actor->context_.reset(engine->get_context_factory()->attach(actor)); /* Add the actor to it's host actor list */ host->get_impl()->add_actor(actor); @@ -135,6 +128,12 @@ void ActorImpl::detach() context->attach_stop(); } +/** Whether this actor is actually maestro */ +bool ActorImpl::is_maestro() const +{ + return context_->is_maestro(); +} + void ActorImpl::cleanup_from_simix() { auto* engine = EngineImpl::get_instance(); @@ -176,7 +175,7 @@ void ActorImpl::cleanup() XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid()); - if (simix_global->is_maestro(this)) /* Do not cleanup maestro */ + if (EngineImpl::get_instance()->is_maestro(this)) /* Do not cleanup maestro */ return; XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro_.get()); @@ -207,7 +206,7 @@ void ActorImpl::exit() /* destroy the blocking synchro if any */ if (waiting_synchro_ != nullptr) { waiting_synchro_->cancel(); - waiting_synchro_->state_ = activity::State::FAILED; + waiting_synchro_->set_state(activity::State::FAILED); activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro_); activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro_); @@ -233,7 +232,7 @@ void ActorImpl::exit() void ActorImpl::kill(ActorImpl* actor) const { - xbt_assert(not simix_global->is_maestro(actor), "Killing maestro is a rather bad idea"); + xbt_assert(not actor->is_maestro(), "Killing maestro is a rather bad idea."); if (actor->finished_) { XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(), actor->host_->get_cname()); @@ -260,7 +259,7 @@ void ActorImpl::kill_all() const void ActorImpl::set_kill_time(double kill_time) { - if (kill_time <= SIMIX_get_clock()) + if (kill_time <= s4u::Engine::get_clock()) return; XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname()); kill_timer_ = timer::Timer::set(kill_time, [this] { @@ -280,7 +279,6 @@ void ActorImpl::yield() /* Go into sleep and return control to maestro */ context_->suspend(); - /* Ok, maestro returned control to us */ XBT_DEBUG("Control returned to me: '%s'", get_cname()); @@ -306,10 +304,10 @@ void ActorImpl::yield() e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); } } - - if (SMPI_switch_data_segment && not finished_) { - SMPI_switch_data_segment(get_iface()); - } +#if HAVE_SMPI + if (not finished_) + smpi_switch_data_segment(get_iface()); +#endif } /** This actor will be terminated automatically when the last non-daemon actor finishes */ @@ -331,7 +329,7 @@ void ActorImpl::undaemonize() s4u::Actor* ActorImpl::restart() { - xbt_assert(not simix_global->is_maestro(this), "Restarting maestro is not supported"); + xbt_assert(not this->is_maestro(), "Restarting maestro is not supported"); XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname()); @@ -425,13 +423,13 @@ void ActorImpl::throw_exception(std::exception_ptr e) void ActorImpl::simcall_answer() { - if (not simix_global->is_maestro(this)) { + auto* engine = EngineImpl::get_instance(); + if (not this->is_maestro()) { XBT_DEBUG("Answer simcall %s issued by %s (%p)", SIMIX_simcall_name(simcall_), get_cname(), this); xbt_assert(simcall_.call_ != simix::Simcall::NONE); simcall_.call_ = simix::Simcall::NONE; - auto* engine = EngineImpl::get_instance(); const auto& actors_to_run = engine->get_actors_to_run(); - xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) || + xbt_assert(not XBT_LOG_ISENABLED(ker_actor, xbt_log_priority_debug) || std::find(begin(actors_to_run), end(actors_to_run), this) == end(actors_to_run), "Actor %p should not exist in actors_to_run!", this); engine->add_actor_to_run_list_no_check(this); @@ -470,7 +468,7 @@ ActorImpl* ActorImpl::start(const ActorCode& code) this->code_ = code; XBT_VERB("Create context %s", get_cname()); - context_.reset(simix_global->get_context_factory()->create_context(ActorCode(code), this)); + context_.reset(engine->get_context_factory()->create_context(ActorCode(code), this)); XBT_DEBUG("Start context '%s'", get_cname()); @@ -495,8 +493,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v else actor = self()->init(xbt::string(name), host); - /* actor data */ - actor->set_user_data(data); + actor->piface_.set_data(data); /* actor data */ actor->start(code); @@ -505,64 +502,32 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v void create_maestro(const std::function& code) { + auto* engine = EngineImpl::get_instance(); /* Create maestro actor and initialize it */ auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); if (not code) { - maestro->context_.reset(simix_global->get_context_factory()->create_context(ActorCode(), maestro)); + maestro->context_.reset(engine->get_context_factory()->create_context(ActorCode(), maestro)); } else { - maestro->context_.reset(simix_global->get_context_factory()->create_maestro(ActorCode(code), maestro)); + maestro->context_.reset(engine->get_context_factory()->create_maestro(ActorCode(code), maestro)); } - maestro->simcall_.issuer_ = maestro; - simix_global->set_maestro(maestro); + maestro->simcall_.issuer_ = maestro; + engine->set_maestro(maestro); } } // namespace actor } // namespace kernel } // namespace simgrid -int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329 -{ - return simgrid::kernel::EngineImpl::get_instance()->get_actor_list().size(); -} - -void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329 -{ - smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); - - if (self == nullptr) { - return nullptr; - } - return self->get_user_data(); -} - -void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329 -{ - simgrid::kernel::actor::ActorImpl::self()->set_user_data(data); -} - -/* needs to be public and without simcall because it is called - by exceptions and logging events */ -const char* SIMIX_process_self_get_name() -{ - return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); -} - -/** @brief Returns the process from PID. */ -smx_actor_t SIMIX_process_from_PID(aid_t pid) -{ - return simgrid::kernel::actor::ActorImpl::by_pid(pid); -} - -void SIMIX_process_on_exit(smx_actor_t actor, - const std::function& fun) // XBT_ATTRIB_DEPRECATED_v329 +/* needs to be public and without simcall because it is called by exceptions and logging events */ +const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333 { - xbt_assert(actor, "current process not found: are you in maestro context ?"); - actor->on_exit->emplace_back(fun); + return simgrid::s4u::Actor::is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); } -void simcall_process_set_data(smx_actor_t process, void* data) // XBT_ATTRIB_DEPRECATED_v329 +int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333 { - simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); }); + const auto* self = simgrid::kernel::actor::ActorImpl::self(); + return self != nullptr && self->is_maestro(); }