X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e196b6000da64a800cf4728450c9d37915c8e15..58bb531bcf303874a5e1356c750423a8490617e9:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index cfec9024c8..4fc435d496 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -5,6 +5,8 @@ #include "mc/mc.h" #include "simgrid/Exception.hpp" +#include "simgrid/s4u/Actor.hpp" +#include "simgrid/s4u/Exec.hpp" #include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" @@ -105,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 (not host_->is_on()) + 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->get_cname(), + 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; }); } @@ -146,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 = @@ -174,13 +253,13 @@ smx_activity_t ActorImpl::suspend(ActorImpl* issuer) return nullptr; } else { - return SIMIX_execution_start("suspend", "", 0.0, 1.0, 0.0, this->host_); + return activity::ExecImplPtr(new activity::ExecImpl("suspend", "", nullptr, this->host_))->start(0.0, 1.0, 0.0); } } void ActorImpl::resume() { - XBT_IN("process = %p", this); + XBT_IN("actor = %p", this); if (context_->iwannadie) { XBT_VERB("Ignoring request to suspend an actor that is currently dying."); @@ -198,19 +277,28 @@ 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."))); - - simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); - synchro->host = host_; - synchro->surf_action_ = host_->pimpl_cpu->sleep(duration); - synchro->surf_action_->set_data(synchro); - XBT_DEBUG("Create sleep synchronization %p", synchro); + XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); - return synchro; + return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_)) + ->start(duration); } void ActorImpl::throw_exception(std::exception_ptr e) @@ -225,8 +313,8 @@ void ActorImpl::throw_exception(std::exception_ptr e) simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro); - if (exec != nullptr && exec->surf_action_) - exec->surf_action_->cancel(); + if (exec != nullptr) + exec->cancel(); simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); @@ -242,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); } } @@ -256,19 +344,26 @@ void ActorImpl::throw_exception(std::exception_ptr e) simgrid::kernel::activity::IoImplPtr io = boost::dynamic_pointer_cast(waiting_synchro); if (io != nullptr) { - delete io.get(); + io->cancel(); } } waiting_synchro = nullptr; } +void ActorImpl::set_host(sg_host_t dest) +{ + simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this); + host_ = dest; + dest->pimpl_->process_list_.push_back(*this); +} + ActorImplPtr ActorImpl::create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host, std::unordered_map* properties, smx_actor_t parent_actor) { 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; } @@ -298,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); @@ -336,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; } @@ -363,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); @@ -405,89 +500,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) { - delete io.get(); - } 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 %s in the to_run list", 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) @@ -502,8 +514,8 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(actor->waiting_synchro); - if (exec != nullptr && exec->surf_action_) - exec->surf_action_->cancel(); + if (exec != nullptr) + exec->cancel(); simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(actor->waiting_synchro); @@ -519,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); } } @@ -533,31 +545,12 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c simgrid::kernel::activity::IoImplPtr io = boost::dynamic_pointer_cast(actor->waiting_synchro); if (io != nullptr) { - delete io.get(); + io->cancel(); } } 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 SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest) -{ - xbt_assert((actor != nullptr), "Invalid parameters"); - simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor); - actor->host_ = dest; - dest->pimpl_->process_list_.push_back(*actor); -} - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); @@ -616,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()) { @@ -653,7 +631,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) { XBT_DEBUG("Destroy sleep synchro %p", synchro.get()); simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(synchro); + boost::static_pointer_cast(synchro); if (sleep->surf_action_) { sleep->surf_action_->unref(); @@ -705,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; @@ -750,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(); }); }