X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10fa8a8eb7be70db4f1a68a53dd22f20681f7092..72b7977026be2ec4497220e10118d392a76b310b:/src/kernel/actor/ActorImpl.cpp?ds=inline diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 37c1d13153..2c3a48a63e 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -33,7 +33,7 @@ static unsigned long simix_process_maxpid = 0; */ smx_actor_t SIMIX_process_self() { - smx_context_t self_context = simgrid::kernel::context::Context::self(); + simgrid::kernel::context::Context* self_context = simgrid::kernel::context::Context::self(); return (self_context != nullptr) ? self_context->get_actor() : nullptr; } @@ -110,8 +110,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h context->attach_start(); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes - simgrid::s4u::Actor::on_creation(tmp); + simgrid::s4u::Actor::on_creation(*actor->ciface()); return ActorImplPtr(actor); } @@ -133,6 +132,29 @@ void ActorImpl::detach() void ActorImpl::cleanup() { + finished_ = true; + + if (has_to_auto_restart() && not get_host()->is_on()) { + XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", get_host()->get_cname(), + get_cname()); + 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); + } + + /* cancel non-blocking activities */ + for (auto activity : comms) + boost::static_pointer_cast(activity)->cancel(); + comms.clear(); + + 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 */ return; @@ -155,9 +177,12 @@ void ActorImpl::cleanup() #endif simix_global->actors_to_destroy.push_back(*this); } - context_->iwannadie = false; 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() @@ -253,18 +278,6 @@ double ActorImpl::get_kill_time() return kill_timer ? kill_timer->get_date() : 0; } -static void dying_daemon(int /*exit_status*/, void* data) -{ - std::vector* vect = &simix_global->daemons; - - auto it = std::find(vect->begin(), vect->end(), static_cast(data)); - 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::yield() { XBT_DEBUG("Yield actor '%s'", get_cname()); @@ -276,7 +289,6 @@ void ActorImpl::yield() XBT_DEBUG("Control returned to me: '%s'", get_cname()); if (context_->iwannadie) { - XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname()); // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor context_->stop(); @@ -309,19 +321,29 @@ void ActorImpl::daemonize() if (not daemon_) { daemon_ = true; simix_global->daemons.push_back(this); - SIMIX_process_on_exit(this, dying_daemon, 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(); + }); } } s4u::Actor* ActorImpl::restart() { + xbt_assert(this != simix_global->maestro_process, "Restarting maestro is not supported"); + XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname()); // retrieve the arguments of the old actor ProcessArg arg = ProcessArg(host_, this); // kill the old actor - (this == simix_global->maestro_process) ? this->exit() : SIMIX_process_self()->kill(this); + context::Context::self()->get_actor()->kill(this); // start the new actor ActorImplPtr actor = @@ -375,17 +397,12 @@ void ActorImpl::resume() activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout) { - activity::ActivityImplPtr res = this->sleep(timeout); - intrusive_ptr_add_ref(res.get()); - SIMIX_process_on_exit(actor, - [](int, void* arg) { - auto sleep = static_cast(arg); - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); - intrusive_ptr_release(sleep); - }, - res.get()); - return res; + activity::ActivityImplPtr sleep = this->sleep(timeout); + SIMIX_process_on_exit(actor, [sleep](bool) { + if (sleep->surf_action_) + sleep->surf_action_->finish(resource::Action::State::FINISHED); + }); + return sleep; } activity::ActivityImplPtr ActorImpl::sleep(double duration) @@ -459,7 +476,7 @@ ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - s4u::Actor::on_creation(actor->iface()); + s4u::Actor::on_creation(*actor->ciface()); return ActorImplPtr(actor); } @@ -710,14 +727,21 @@ smx_actor_t SIMIX_process_from_PID(aid_t PID) void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data) { - SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); + SIMIX_process_on_exit(actor, [fun, data](bool failed) { + intptr_t status = failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; + fun(reinterpret_cast(status), data); + }); } -void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) +void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) { - xbt_assert(actor, "current process not found: are you in maestro context ?"); + SIMIX_process_on_exit(actor, [fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); }); +} - actor->on_exit.emplace_back(s_smx_process_exit_fun_t{fun, data}); +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); } /** @brief Restart a process, starting it again from the beginning. */