X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0c6d71dd724e0ff6ecbac8543a5369f5b98b960..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index f50964b8f5..19ff81c784 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -1,31 +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 "simgrid/s4u/Actor.hpp" -#include "mc/mc.h" -#include "simgrid/Exception.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" #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. @@ -34,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(); } @@ -68,7 +60,7 @@ 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() @@ -136,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(); @@ -208,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_); @@ -234,7 +232,7 @@ void ActorImpl::exit() void ActorImpl::kill(ActorImpl* actor) const { - xbt_assert(not EngineImpl::get_instance()->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()); @@ -281,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()); @@ -307,7 +304,6 @@ void ActorImpl::yield() e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); } } - #if HAVE_SMPI if (not finished_) smpi_switch_data_segment(get_iface()); @@ -333,7 +329,7 @@ void ActorImpl::undaemonize() s4u::Actor* ActorImpl::restart() { - xbt_assert(not EngineImpl::get_instance()->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()); @@ -428,12 +424,12 @@ void ActorImpl::throw_exception(std::exception_ptr e) void ActorImpl::simcall_answer() { auto* engine = EngineImpl::get_instance(); - if (not engine->is_maestro(this)) { + 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; 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); @@ -497,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->piface_.set_data(data); + actor->piface_.set_data(data); /* actor data */ actor->start(code); @@ -518,22 +513,21 @@ void create_maestro(const std::function& code) } maestro->simcall_.issuer_ = maestro; - EngineImpl::get_instance()->set_maestro(maestro); + engine->set_maestro(maestro); } } // namespace actor } // namespace kernel } // namespace simgrid -/* needs to be public and without simcall because it is called - by exceptions and logging events */ -const char* SIMIX_process_self_get_name() +/* 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 { - return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); + return simgrid::s4u::Actor::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) // XBT_ATTRIB_DEPRECATD_v331 +int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333 { - return simgrid::kernel::actor::ActorImpl::by_pid(pid); + const auto* self = simgrid::kernel::actor::ActorImpl::self(); + return self != nullptr && self->is_maestro(); }