X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22a6d90e2d923507bc5b418147c8e3d5c9a8f9e9..f06f53287a228a869aba211842c5e46ab29b116a:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 99b32d2897..08199ba8ab 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -22,8 +22,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); -static unsigned long simix_process_maxpid = 0; - /** * @brief Returns the current agent. * @@ -53,13 +51,28 @@ namespace simgrid { namespace kernel { namespace actor { +static unsigned long maxpid = 0; +int get_maxpid() +{ + return maxpid; +} + ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this) { - pid_ = simix_process_maxpid++; + pid_ = maxpid++; simcall.issuer = this; } -ActorImpl::~ActorImpl() = default; +ActorImpl::~ActorImpl() +{ + if (simix_global != nullptr && this != simix_global->maestro_process) { + 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::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); + if (context_.get() != nullptr) + context_->iwannadie = true; + } +} /* Become an actor in the simulation * @@ -78,14 +91,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"); @@ -139,13 +151,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) @@ -180,21 +193,16 @@ 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()); }); + simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); }); context_->iwannadie = true; } void ActorImpl::exit() { context_->iwannadie = true; - blocked_ = false; suspended_ = false; exception_ = nullptr; - // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that - if (not host_->is_on()) - this->throw_exception(std::make_exception_ptr(ForcefulKillException("host failed"))); - /* destroy the blocking synchro if any */ if (waiting_synchro != nullptr) { waiting_synchro->cancel(); @@ -217,6 +225,9 @@ void ActorImpl::exit() waiting_synchro = nullptr; } + + // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that + this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed"))); } void ActorImpl::kill(ActorImpl* actor) @@ -306,15 +317,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; } } @@ -333,7 +349,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->on_exit = std::move(*arg.on_exit); actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); @@ -424,6 +440,20 @@ void ActorImpl::throw_exception(std::exception_ptr e) } } +void ActorImpl::simcall_answer() +{ + if (this != simix_global->maestro_process){ + 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; + xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) || + std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) == + end(simix_global->actors_to_run), + "Actor %p should not exist in actors_to_run!", this); + simix_global->actors_to_run.push_back(this); + } +} + void ActorImpl::set_host(s4u::Host* dest) { xbt::intrusive_erase(host_->pimpl_->process_list_, *this); @@ -450,11 +480,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)); @@ -513,34 +542,24 @@ void create_maestro(const std::function& code) } // namespace kernel } // namespace simgrid -void SIMIX_process_detach() +void SIMIX_process_detach() // deprecated v3.25 { simgrid::kernel::actor::ActorImpl::detach(); } smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, std::unordered_map* properties, - smx_actor_t /*parent_process*/) + smx_actor_t /*parent_process*/) // deprecated 3.25 { 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) -{ - xbt_ex e(XBT_THROW_POINT, msg); - e.category = cat; - e.value = value; - actor->throw_exception(std::make_exception_ptr(e)); -} - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); if (actor != simcall->issuer) { - SIMIX_simcall_answer(simcall); + simcall->issuer->simcall_answer(); } else { sync_suspend->simcalls_.push_back(simcall); actor->waiting_synchro = sync_suspend; @@ -549,11 +568,6 @@ void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) /* If we are suspending ourselves, then just do not finish the simcall now */ } -int SIMIX_process_get_maxpid() -{ - return simix_process_maxpid; -} - int SIMIX_process_count() { return simix_global->process_list.size(); @@ -586,25 +600,12 @@ const char* SIMIX_process_self_get_name() return process->get_cname(); } -void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout) -{ - if (process->finished_) { - // The joined process is already finished, just wake up the issuer process right away - simcall_process_sleep__set__result(simcall, SIMIX_DONE); - SIMIX_simcall_answer(simcall); - return; - } - smx_activity_t sync = simcall->issuer->join(process, timeout); - sync->simcalls_.push_back(simcall); - simcall->issuer->waiting_synchro = sync; -} - void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) { if (MC_is_active() || MC_record_replay_is_active()) { MC_process_clock_add(simcall->issuer, duration); simcall_process_sleep__set__result(simcall, SIMIX_DONE); - SIMIX_simcall_answer(simcall); + simcall->issuer->simcall_answer(); return; } smx_activity_t sync = simcall->issuer->sleep(duration); @@ -631,8 +632,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) @@ -651,7 +658,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. */