X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6d6922922724a7495eb66d9f35fb7085b7d23ba..0a6556cf9aa3e733965b6a18574efd63b54caa0d:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 47b901ce5e..c863647e97 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -3,13 +3,11 @@ /* 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 "src/mc/mc_replay.hpp" #include #include #include -#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333) -#include - #include "src/kernel/EngineImpl.hpp" #if HAVE_SMPI #include "src/smpi/include/private.hpp" @@ -22,33 +20,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side"); -/** - * @brief Returns the current agent. - * - * This functions returns the currently running SIMIX process. - * - * @return The SIMIX process - */ -smx_actor_t SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333 -{ - return simgrid::kernel::actor::ActorImpl::self(); -} - -namespace simgrid { -namespace kernel { -namespace actor { +namespace simgrid::kernel::actor { /*------------------------- [ ActorIDTrait ] -------------------------*/ -static unsigned long maxpid = 0; -unsigned long get_maxpid() -{ - return maxpid; -} -unsigned long* get_maxpid_addr() -{ - return &maxpid; -} -ActorIDTrait::ActorIDTrait(std::string name, aid_t ppid) : name_(std::move(name)), pid_(maxpid++), ppid_(ppid) {} +unsigned long ActorIDTrait::maxpid_ = 0; + +ActorIDTrait::ActorIDTrait(const std::string& name, aid_t ppid) : name_(name), pid_(maxpid_++), ppid_(ppid) {} ActorImpl* ActorImpl::self() { @@ -57,7 +34,7 @@ ActorImpl* ActorImpl::self() return (self_context != nullptr) ? self_context->get_actor() : nullptr; } -ActorImpl::ActorImpl(xbt::string name, s4u::Host* host, aid_t ppid) +ActorImpl::ActorImpl(std::string name, s4u::Host* host, aid_t ppid) : ActorIDTrait(std::move(name), ppid), host_(host), piface_(this) { simcall_.issuer_ = this; @@ -89,7 +66,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } - auto* actor = new ActorImpl(xbt::string(name), host, /*ppid*/ -1); + auto* actor = new ActorImpl(std::string(name), host, /*ppid*/ -1); /* Actor data */ actor->piface_.set_data(data); actor->code_ = nullptr; @@ -137,10 +114,12 @@ bool ActorImpl::is_maestro() const void ActorImpl::cleanup_from_kernel() { - xbt_assert(s4u::Actor::is_maestro(), "Cleanup_from_kernel called from '%s' on '%s'", ActorImpl::self()->get_cname(), - get_cname()); + xbt_assert(s4u::Actor::is_maestro(), "Cleanup_from_kernel must be called in maestro context"); auto* engine = EngineImpl::get_instance(); + if (engine->get_actor_by_pid(get_pid()) == nullptr) + return; // Already cleaned + engine->remove_actor(get_pid()); if (host_ && host_actor_list_hook.is_linked()) host_->get_impl()->remove_actor(this); @@ -154,6 +133,7 @@ void ActorImpl::cleanup_from_kernel() } undaemonize(); + s4u::Actor::on_termination(*get_ciface()); while (not mailboxes_.empty()) mailboxes_.back()->set_receiver(nullptr); @@ -191,8 +171,9 @@ void ActorImpl::cleanup_from_self() simcall_.timeout_cb_ = nullptr; } - set_wannadie(false); // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - actor::simcall_answered([this] { s4u::Actor::on_termination(*get_ciface()); }); + /* maybe the actor was killed during a simcall, reset its observer */ + simcall_.observer_ = nullptr; + set_wannadie(); } @@ -242,9 +223,9 @@ void ActorImpl::kill(ActorImpl* actor) const void ActorImpl::kill_all() const { - for (auto const& kv : EngineImpl::get_instance()->get_actor_list()) - if (kv.second != this) - this->kill(kv.second); + for (auto const& [_, actor] : EngineImpl::get_instance()->get_actor_list()) + if (actor != this) + this->kill(actor); } void ActorImpl::set_kill_time(double kill_time) @@ -299,6 +280,8 @@ void ActorImpl::yield() if (not wannadie()) smpi_switch_data_segment(get_iface()); #endif + if (simgrid_mc_replay_show_backtraces) + xbt_backtrace_display_current(); } /** This actor will be terminated automatically when the last non-daemon actor finishes */ @@ -372,17 +355,17 @@ void ActorImpl::resume() activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout) { - activity::ActivityImplPtr sleep = this->sleep(timeout); + activity::ActivityImplPtr sleep_activity = this->sleep(timeout); if (actor->wannadie() || actor->to_be_freed()) { - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); + if (sleep_activity->surf_action_) + sleep_activity->surf_action_->finish(resource::Action::State::FINISHED); } else { - actor->on_exit->emplace_back([sleep](bool) { - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); + actor->on_exit->emplace_back([sleep_activity](bool) { + if (sleep_activity->surf_action_) + sleep_activity->surf_action_->finish(resource::Action::State::FINISHED); }); } - return sleep; + return sleep_activity; } activity::ActivityImplPtr ActorImpl::sleep(double duration) @@ -391,9 +374,9 @@ activity::ActivityImplPtr ActorImpl::sleep(double duration) 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(); - sleep->set_name("sleep").set_host(host_).set_duration(duration).start(); - return activity::SleepImplPtr(sleep); + auto sleep_activity = new activity::SleepImpl(); + sleep_activity->set_name("sleep").set_host(host_).set_duration(duration).start(); + return activity::SleepImplPtr(sleep_activity); } void ActorImpl::throw_exception(std::exception_ptr e) @@ -435,7 +418,7 @@ void ActorImpl::set_host(s4u::Host* dest) ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const { - auto* actor = new ActorImpl(xbt::string(name), host, get_pid()); + auto* actor = new ActorImpl(name, host, get_pid()); intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ @@ -478,9 +461,9 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v ActorImplPtr actor; if (parent_actor != nullptr) - actor = parent_actor->init(xbt::string(name), host); + actor = parent_actor->init(name, host); else - actor = self()->init(xbt::string(name), host); + actor = self()->init(name, host); actor->piface_.set_data(data); /* actor data */ @@ -513,7 +496,7 @@ 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, /*ppid*/ -1); + auto* maestro = new ActorImpl(/*name*/ "", /*host*/ nullptr, /*ppid*/ -1); if (not code) { maestro->context_.reset(engine->get_context_factory()->create_context(ActorCode(), maestro)); @@ -525,18 +508,4 @@ void create_maestro(const std::function& code) 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() // XBT_ATTRIB_DEPRECATED_v333 -{ - return simgrid::s4u::Actor::is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); -} - -int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333 -{ - const auto* self = simgrid::kernel::actor::ActorImpl::self(); - return self != nullptr && self->is_maestro(); -} +} // namespace simgrid::kernel::actor