X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d923cc54672d126f8641229a698f7181b424825..2f750aacf2dd98445821a7209980f6c354207a86:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 5cea62caab..fc75399d82 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -59,7 +59,12 @@ ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_( simcall.issuer = this; } -ActorImpl::~ActorImpl() = default; +ActorImpl::~ActorImpl() +{ + context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops + simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); + context_->iwannadie = true; +} /* Become an actor in the simulation * @@ -70,7 +75,7 @@ ActorImpl::~ActorImpl() = default; */ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* host, - std::unordered_map* properties) + const std::unordered_map* properties) { // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions. @@ -78,14 +83,13 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h if (not host->is_on()) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname()); - std::rethrow_exception( - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."))); + throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } ActorImpl* actor = new ActorImpl(xbt::string(name), host); /* Actor data */ actor->set_user_data(data); - actor->code = nullptr; + 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"); @@ -93,8 +97,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h /* Add properties */ if (properties != nullptr) - for (auto const& kv : *properties) - actor->set_property(kv.first, kv.second); + actor->set_properties(*properties); /* Add the process to it's host process list */ host->pimpl_->process_list_.push_back(*actor); @@ -140,13 +143,14 @@ void ActorImpl::cleanup() watched_hosts.insert(get_host()->get_name()); } - // Execute the termination callbacks - bool failed = context_->iwannadie; - while (not on_exit.empty()) { - auto exit_fun = on_exit.back(); - on_exit.pop_back(); - exit_fun(failed); + if (on_exit) { + // Execute the termination callbacks + bool failed = context_->iwannadie; + for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun) + (*exit_fun)(failed); + on_exit.reset(); } + undaemonize(); /* cancel non-blocking activities */ for (auto activity : comms) @@ -179,16 +183,11 @@ void ActorImpl::cleanup() } simix_global->mutex.unlock(); - - context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); - context_->iwannadie = true; } void ActorImpl::exit() { context_->iwannadie = true; - blocked_ = false; suspended_ = false; exception_ = nullptr; @@ -307,15 +306,20 @@ void ActorImpl::daemonize() if (not daemon_) { daemon_ = true; simix_global->daemons.push_back(this); - SIMIX_process_on_exit(this, [this](bool) { - auto& vect = simix_global->daemons; - auto it = std::find(vect.begin(), vect.end(), this); - xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug."); - - /* Don't move the whole content since we don't really care about the order */ - std::swap(*it, vect.back()); - vect.pop_back(); - }); + } +} + +void ActorImpl::undaemonize() +{ + if (daemon_) { + auto& vect = simix_global->daemons; + auto it = std::find(vect.begin(), vect.end(), this); + xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug."); + /* Don't move the whole content since we don't really care about the order */ + + std::swap(*it, vect.back()); + vect.pop_back(); + daemon_ = false; } } @@ -334,6 +338,7 @@ s4u::Actor* ActorImpl::restart() // start the new actor ActorImplPtr actor = ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr); + *actor->on_exit = std::move(*arg.on_exit); actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); @@ -416,23 +421,12 @@ void ActorImpl::throw_exception(std::exception_ptr e) waiting_synchro->cancel(); activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); - activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(waiting_synchro); - if (comm != nullptr) { + if (comm != nullptr) comms.remove(comm); - } - if (sleep != nullptr) { - if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) == - end(simix_global->actors_to_run) && - this != SIMIX_process_self()) { - XBT_DEBUG("Inserting [%p] %s in the to_run list", this, get_cname()); - simix_global->actors_to_run.push_back(this); - } - } + waiting_synchro = nullptr; } - - waiting_synchro = nullptr; } void ActorImpl::set_host(s4u::Host* dest) @@ -461,11 +455,10 @@ 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); - std::rethrow_exception( - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."))); + throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."); } - this->code = code; + this->code_ = code; XBT_VERB("Create context %s", get_cname()); context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this)); @@ -483,7 +476,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) } ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host, - std::unordered_map* properties, ActorImpl* parent_actor) + const std::unordered_map* properties, ActorImpl* parent_actor) { XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); @@ -498,8 +491,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& /* Add properties */ if (properties != nullptr) - for (auto const& kv : *properties) - actor->set_property(kv.first, kv.second); + actor->set_properties(*properties); actor->start(code); @@ -537,57 +529,6 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get(); } -/** @deprecated When this function gets removed, also remove the xbt_ex class, that is only there to help users to - * transition */ -void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const char* msg) -{ - SMX_EXCEPTION(actor, cat, value, msg); - - if (actor->is_suspended()) - actor->resume(); - - /* cancel the blocking synchro if any */ - if (actor->waiting_synchro) { - - simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (exec != nullptr) - exec->cancel(); - - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (comm != nullptr) { - actor->comms.remove(comm); - comm->cancel(); - } - - simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (sleep != nullptr) { - sleep->clean_action(); - if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) == - end(simix_global->actors_to_run) && - actor != SIMIX_process_self()) { - XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname()); - simix_global->actors_to_run.push_back(actor); - } - } - - simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (raw != nullptr) { - raw->finish(); - } - - simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (io != nullptr) { - io->cancel(); - } - } - actor->waiting_synchro = nullptr; -} - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); @@ -684,8 +625,14 @@ const std::vector& simgrid::simix::process_get_runnable() /** @brief Returns the process from PID. */ smx_actor_t SIMIX_process_from_PID(aid_t PID) { - auto actor = simix_global->process_list.find(PID); - return actor == simix_global->process_list.end() ? nullptr : actor->second; + auto item = simix_global->process_list.find(PID); + if (item == simix_global->process_list.end()) { + for (auto& a : simix_global->actors_to_destroy) + if (a.get_pid() == PID) + return &a; + return nullptr; // Not found, even in the trash + } + return item->second; } void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data) @@ -704,7 +651,7 @@ void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun) { xbt_assert(actor, "current process not found: are you in maestro context ?"); - actor->on_exit.emplace_back(fun); + actor->on_exit->emplace_back(fun); } /** @brief Restart a process, starting it again from the beginning. */