From: Frederic Suter Date: Tue, 12 Feb 2019 13:07:48 +0000 (+0100) Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid X-Git-Tag: v3_22~356 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9f62e12607e183452816941da3e99bb5efda40d0?hp=-c Merge branch 'master' of https://framagit.org/simgrid/simgrid --- 9f62e12607e183452816941da3e99bb5efda40d0 diff --combined src/simix/ActorImpl.cpp index 71605ced34,d3852f76a3..eb14cb6fc8 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@@ -107,90 -107,13 +107,90 @@@ ActorImpl::~ActorImpl( delete this->context_; } +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 (host_->is_off()) + this->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed"))); + + /* destroy the blocking synchro if any */ + if (waiting_synchro != nullptr) { + + activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro); + activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); + activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(waiting_synchro); + activity::RawImplPtr raw = boost::dynamic_pointer_cast(waiting_synchro); + activity::IoImplPtr io = boost::dynamic_pointer_cast(waiting_synchro); + + if (exec != nullptr && exec->surf_action_) { + exec->cancel(); + exec->surf_action_->unref(); + exec->surf_action_ = nullptr; + } else if (comm != nullptr) { + comms.remove(waiting_synchro); + comm->cancel(); + // Remove first occurrence of &process->simcall: + auto i = boost::range::find(waiting_synchro->simcalls_, &simcall); + if (i != waiting_synchro->simcalls_.end()) + waiting_synchro->simcalls_.remove(&simcall); + } else if (sleep != nullptr) { + if (sleep->surf_action_) + sleep->surf_action_->cancel(); + sleep->post(); + } else if (raw != nullptr) { + SIMIX_synchro_stop_waiting(this, &simcall); + } else if (io != nullptr) { + io->cancel(); + } else { + simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro; + xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(), + simgrid::xbt::demangle(typeid(activity).name()).get()); + } + + waiting_synchro = nullptr; + } +} + +void ActorImpl::kill(smx_actor_t actor) +{ + if (actor->finished_) { + XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", actor->get_cname(), + actor->host_->get_cname()); + return; + } + + XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_->get_cname(), actor->get_cname(), + actor->host_->get_cname()); + + actor->exit(); + + if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) == + end(simix_global->process_to_run) && + actor != this) { + XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); + simix_global->process_to_run.push_back(actor); + } +} + +void ActorImpl::kill_all() +{ + for (auto const& kv : simix_global->process_list) + if (kv.second != this) + this->kill(kv.second); +} + void ActorImpl::set_kill_time(double kill_time) { if (kill_time <= SIMIX_get_clock()) return; XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, get_cname(), host_->get_cname()); kill_timer = SIMIX_timer_set(kill_time, [this] { - SIMIX_process_kill(this, nullptr); + this->exit(); kill_timer = nullptr; }); } @@@ -225,7 -148,7 +225,7 @@@ simgrid::s4u::Actor* ActorImpl::restart simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this); // kill the old process - SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self()); + (this == simix_global->maestro_process) ? this->exit() : SIMIX_process_self()->kill(this); // start the new process ActorImplPtr actor = @@@ -316,7 -239,7 +316,7 @@@ void ActorImpl::throw_exception(std::ex if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), this) == end(simix_global->process_to_run) && this != SIMIX_process_self()) { - XBT_DEBUG("Inserting %s in the to_run list", get_cname()); + XBT_DEBUG("Inserting [%p] %s in the to_run list", this, get_cname()); simix_global->process_to_run.push_back(this); } } @@@ -379,7 -302,7 +379,7 @@@ ActorImplPtr ActorImpl::create(std::str /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[actor->pid_] = actor; - XBT_DEBUG("Inserting %s(%s) in the to_run list", actor->get_cname(), host->get_cname()); + XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(actor); intrusive_ptr_add_ref(actor); @@@ -444,7 -367,7 +444,7 @@@ smx_actor_t SIMIX_process_attach(const /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[actor->pid_] = actor; - XBT_DEBUG("Inserting %s(%s) in the to_run list", actor->get_cname(), host->get_cname()); + XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(actor); intrusive_ptr_add_ref(actor); @@@ -486,6 -409,89 +486,6 @@@ void SIMIX_process_runall( simix_global->process_to_run.clear(); } -/** - * @brief Internal function to kill a SIMIX process. - * - * This function may be called when a SIMCALL_PROCESS_KILL simcall occurs, - * or directly for SIMIX internal purposes. - * - * @param actor poor victim - * @param issuer the actor which has sent the PROCESS_KILL. Important to not schedule twice the same actor. - */ -void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer) -{ - - if (actor->finished_) { - XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", actor->get_cname(), - actor->host_->get_cname()); - return; - } - - XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer == nullptr ? "(null)" : issuer->get_cname(), - (issuer == nullptr || issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(), - actor->host_->get_cname()); - - actor->context_->iwannadie = true; - actor->blocked_ = false; - actor->suspended_ = false; - actor->exception = nullptr; - - // Forcefully kill the actor if its host is turned off. Not an HostFailureException because you should not survive that - if (actor->host_->is_off()) - actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed"))); - - /* destroy the blocking synchro if any */ - if (actor->waiting_synchro != nullptr) { - - simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(actor->waiting_synchro); - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(actor->waiting_synchro); - simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(actor->waiting_synchro); - simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(actor->waiting_synchro); - simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(actor->waiting_synchro); - - if (exec != nullptr) { - if (exec->surf_action_) { - exec->surf_action_->cancel(); - exec->surf_action_->unref(); - exec->surf_action_ = nullptr; - } - } else if (comm != nullptr) { - actor->comms.remove(actor->waiting_synchro); - comm->cancel(); - // Remove first occurrence of &process->simcall: - auto i = boost::range::find(actor->waiting_synchro->simcalls_, &actor->simcall); - if (i != actor->waiting_synchro->simcalls_.end()) - actor->waiting_synchro->simcalls_.remove(&actor->simcall); - } else if (sleep != nullptr) { - if (sleep->surf_action_) - sleep->surf_action_->cancel(); - sleep->post(); - } else if (raw != nullptr) { - SIMIX_synchro_stop_waiting(actor, &actor->simcall); - - } else if (io != nullptr) { - io->cancel(); - } else { - simgrid::kernel::activity::ActivityImplPtr activity = actor->waiting_synchro; - xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(), - simgrid::xbt::demangle(typeid(activity).name()).get()); - } - - actor->waiting_synchro = nullptr; - } - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) == - end(simix_global->process_to_run) && - actor != issuer) { - XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname()); - simix_global->process_to_run.push_back(actor); - } -} - /** @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) @@@ -517,7 -523,7 +517,7 @@@ if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) == end(simix_global->process_to_run) && actor != SIMIX_process_self()) { - XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); + XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname()); simix_global->process_to_run.push_back(actor); } } @@@ -537,6 -543,18 +537,6 @@@ actor->waiting_synchro = nullptr; } -/** - * @brief Kills all running processes. - * @param issuer this one will not be killed - */ -void SIMIX_process_killall(smx_actor_t issuer) -{ - for (auto const& kv : simix_global->process_list) - if (kv.second != issuer) - SIMIX_process_kill(kv.second, issuer); -} - - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); @@@ -684,7 -702,9 +684,9 @@@ void SIMIX_process_yield(smx_actor_t se } } - /** @brief Returns the list of processes to run. */ + /** @brief Returns the list of processes to run. + * @deprecated + */ const std::vector& simgrid::simix::process_get_runnable() { return simix_global->process_to_run;