X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df0be021e84cc3e41020af8f1a5077d6737905c3..52b5d4fb3c307a34756d8a95aadf79d01af14cdd:/src/kernel/actor/ActorImpl.cpp?ds=sidebyside diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 40c38f0848..fdf73a3b89 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -32,9 +32,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX */ smx_actor_t SIMIX_process_self() { - simgrid::kernel::context::Context* self_context = simgrid::kernel::context::Context::self(); - - return (self_context != nullptr) ? self_context->get_actor() : nullptr; + return simgrid::kernel::actor::ActorImpl::self(); } namespace simgrid { @@ -47,7 +45,14 @@ int get_maxpid() return maxpid; } -ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this) +ActorImpl* ActorImpl::self() +{ + context::Context* self_context = context::Context::self(); + + return (self_context != nullptr) ? self_context->get_actor() : nullptr; +} + +ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this) { pid_ = maxpid++; simcall.issuer_ = this; @@ -55,10 +60,10 @@ ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), ActorImpl::~ActorImpl() { - if (simix_global != nullptr && this != simix_global->maestro_process) { + if (simix_global != nullptr && this != simix_global->maestro_) { if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */ context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); + actor::simcall([this] { s4u::Actor::on_destruction(*ciface()); }); if (context_.get() != nullptr) context_->iwannadie = true; } @@ -77,11 +82,11 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h { // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions. - XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname()); + XBT_DEBUG("Attach actor %s on host '%s'", name.c_str(), host->get_cname()); if (not host->is_on()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname()); - throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); + XBT_WARN("Cannot attach actor '%s' on failed host '%s'", name.c_str(), host->get_cname()); + throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } ActorImpl* actor = new ActorImpl(xbt::string(name), host); @@ -97,21 +102,21 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h if (properties != nullptr) actor->set_properties(*properties); - /* Add the process to it's host process list */ + /* Add the actor to it's host actor list */ host->pimpl_->add_actor(actor); - /* Now insert it in the global process list and in the process to run list */ + /* Now insert it in the global actor list and in the actors to run list */ simix_global->process_list[actor->get_pid()] = actor; XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname()); simix_global->actors_to_run.push_back(actor); intrusive_ptr_add_ref(actor); - auto* context = dynamic_cast(actor->context_.get()); + auto* context = dynamic_cast(actor->context_.get()); xbt_assert(nullptr != context, "Not a suitable context"); context->attach_start(); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::Actor::on_creation(*actor->ciface()); + s4u::Actor::on_creation(*actor->ciface()); return ActorImplPtr(actor); } @@ -131,6 +136,20 @@ void ActorImpl::detach() context->attach_stop(); } +void ActorImpl::cleanup_from_simix() +{ + const std::lock_guard lock(simix_global->mutex); + simix_global->process_list.erase(pid_); + if (host_ && host_actor_list_hook.is_linked()) + host_->pimpl_->remove_actor(this); + if (not smx_destroy_list_hook.is_linked()) { +#if SIMGRID_HAVE_MC + xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this); +#endif + simix_global->actors_to_destroy.push_back(*this); + } +} + void ActorImpl::cleanup() { finished_ = true; @@ -157,7 +176,7 @@ void ActorImpl::cleanup() XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid()); - if (this == simix_global->maestro_process) /* Do not cleanup maestro */ + if (this == simix_global->maestro_) /* Do not cleanup maestro */ return; XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get()); @@ -167,23 +186,10 @@ void ActorImpl::cleanup() kill_timer->remove(); kill_timer = nullptr; } - - simix_global->mutex.lock(); - - simix_global->process_list.erase(pid_); - if (host_ && host_actor_list_hook.is_linked()) - host_->pimpl_->remove_actor(this); - if (not smx_destroy_list_hook.is_linked()) { -#if SIMGRID_HAVE_MC - xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this); -#endif - simix_global->actors_to_destroy.push_back(*this); - } - - simix_global->mutex.unlock(); + cleanup_from_simix(); context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); }); + actor::simcall([this] { s4u::Actor::on_termination(*ciface()); }); context_->iwannadie = true; } @@ -222,7 +228,7 @@ void ActorImpl::exit() void ActorImpl::kill(ActorImpl* actor) { - xbt_assert(actor != simix_global->maestro_process, "Killing maestro is a rather bad idea"); + xbt_assert(actor != simix_global->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()); @@ -326,7 +332,7 @@ void ActorImpl::undaemonize() s4u::Actor* ActorImpl::restart() { - xbt_assert(this != simix_global->maestro_process, "Restarting maestro is not supported"); + xbt_assert(this != simix_global->maestro_, "Restarting maestro is not supported"); XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname()); @@ -386,7 +392,7 @@ void ActorImpl::resume() XBT_OUT(); } -activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout) +activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout) { activity::ActivityImplPtr sleep = this->sleep(timeout); actor->on_exit->emplace_back([sleep](bool) { @@ -399,7 +405,7 @@ activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout) activity::ActivityImplPtr ActorImpl::sleep(double duration) { if (not host_->is_on()) - throw_exception(std::make_exception_ptr(simgrid::HostFailureException( + throw_exception(std::make_exception_ptr(HostFailureException( XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); auto sleep = new activity::SleepImpl(); @@ -429,7 +435,7 @@ void ActorImpl::throw_exception(std::exception_ptr e) void ActorImpl::simcall_answer() { - if (this != simix_global->maestro_process){ + if (this != simix_global->maestro_) { XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call_), (int)simcall.call_, get_cname(), this); simcall.call_ = SIMCALL_NONE; @@ -467,7 +473,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) if (not host_->is_on()) { XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname()); intrusive_ptr_release(this); - throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."); + throw HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."); } this->code_ = code; @@ -496,7 +502,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& if (parent_actor != nullptr) actor = parent_actor->init(xbt::string(name), host); else - actor = SIMIX_process_self()->init(xbt::string(name), host); + actor = self()->init(xbt::string(name), host); /* actor data */ actor->set_user_data(data); @@ -522,7 +528,7 @@ void create_maestro(const std::function& code) } maestro->simcall.issuer_ = maestro; - simix_global->maestro_process = maestro; + simix_global->maestro_ = maestro; } } // namespace actor @@ -537,7 +543,7 @@ int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329 // XBT_DEPRECATED_v329 void* SIMIX_process_self_get_data() { - smx_actor_t self = SIMIX_process_self(); + smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); if (self == nullptr) { return nullptr; @@ -548,14 +554,14 @@ void* SIMIX_process_self_get_data() // XBT_DEPRECATED_v329 void SIMIX_process_self_set_data(void* data) { - SIMIX_process_self()->set_user_data(data); + 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" : SIMIX_process_self()->get_cname(); + return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); } /** @@ -604,7 +610,7 @@ void SIMIX_process_on_exit(smx_actor_t actor, smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix::ActorCode& code, void* data, sg_host_t host, std::unordered_map* properties) { - smx_actor_t self = SIMIX_process_self(); + smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); return simgrid::kernel::actor::simcall([&name, &code, data, host, properties, self] { return simgrid::kernel::actor::ActorImpl::create(name, code, data, host, properties, self).get(); });