X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33e691a44189f86fa42deb0e83b64da29d5819b2..04a7baf19b76686f36ed0693acaacdf2adbc5d0d:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index ac2292e0dd..2a5262f149 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -115,7 +115,7 @@ void ActorImpl::exit() 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()) + if (not host_->is_on()) this->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed"))); /* destroy the blocking synchro if any */ @@ -177,6 +177,13 @@ void ActorImpl::kill(smx_actor_t 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()) @@ -270,9 +277,23 @@ void ActorImpl::resume() XBT_OUT(); } +smx_activity_t ActorImpl::join(smx_actor_t actor, double timeout) +{ + smx_activity_t 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(simgrid::kernel::resource::Action::State::FINISHED); + intrusive_ptr_release(sleep); + }, + res.get()); + return res; +} smx_activity_t ActorImpl::sleep(double duration) { - if (host_->is_off()) + if (not host_->is_on()) throw_exception(std::make_exception_ptr(simgrid::HostFailureException( XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there."))); @@ -309,7 +330,7 @@ void ActorImpl::throw_exception(std::exception_ptr e) 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); } } @@ -342,7 +363,7 @@ ActorImplPtr ActorImpl::create(std::string name, simgrid::simix::ActorCode code, XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); - if (host->is_off()) { + if (not host->is_on()) { XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name.c_str(), host->get_cname()); return nullptr; } @@ -372,7 +393,7 @@ ActorImplPtr ActorImpl::create(std::string name, simgrid::simix::ActorCode code, /* 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); @@ -410,7 +431,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn sg_host_t host = sg_host_by_name(hostname); XBT_DEBUG("Attach process %s on host '%s'", name, hostname); - if (host->is_off()) { + if (not host->is_on()) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname); return nullptr; } @@ -437,7 +458,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn /* 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); @@ -510,7 +531,7 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c 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); } } @@ -530,17 +551,6 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c 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) - issuer->kill(kv.second); -} - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); @@ -599,26 +609,11 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do SIMIX_simcall_answer(simcall); return; } - smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout); + smx_activity_t sync = simcall->issuer->join(process, timeout); sync->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = sync; } -smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout) -{ - smx_activity_t res = issuer->sleep(timeout); - intrusive_ptr_add_ref(res.get()); - SIMIX_process_on_exit(process, - [](int, void* arg) { - auto sleep = static_cast(arg); - if (sleep->surf_action_) - sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED); - intrusive_ptr_release(sleep); - }, - res.get()); - return res; -} - void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) { if (MC_is_active() || MC_record_replay_is_active()) { @@ -688,7 +683,9 @@ void SIMIX_process_yield(smx_actor_t self) } } -/** @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; @@ -733,7 +730,8 @@ smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode c { smx_actor_t self = SIMIX_process_self(); return simgrid::simix::simcall([name, code, data, host, properties, self] { - return simgrid::kernel::actor::ActorImpl::create(name, std::move(code), data, host, properties, self).get(); + return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(code), data, host, properties, self) + .get(); }); }