X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed48bb9aa5dc358f65a2e4e854d3b8c49bef5273..239a6c2b5cf6df25b93d95b5df30fb5fbacbfbcd:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 79f201672e..3b42e4c566 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -16,7 +16,6 @@ #include "src/mc/mc_replay.hpp" #include "src/mc/remote/Client.hpp" #include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_io_private.hpp" #include "src/simix/smx_synchro_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" @@ -50,74 +49,137 @@ int SIMIX_process_has_pending_comms(smx_actor_t process) { return process->comms.size() > 0; } -/** - * @brief Moves a process to the list of processes to destroy. - */ -void SIMIX_process_cleanup(smx_actor_t process) +namespace simgrid { +namespace kernel { +namespace actor { + +ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(name), piface_(this) { - XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process, - process->waiting_synchro.get()); + pid_ = simix_process_maxpid++; + simcall.issuer = this; +} + +ActorImpl::~ActorImpl() +{ + delete this->context_; +} + +void ActorImpl::cleanup() +{ + if (this == simix_global->maestro_process) /* Do not cleanup maestro */ + return; + + XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get()); simix_global->mutex.lock(); - simix_global->process_list.erase(process->pid_); - if (process->host_ && process->host_process_list_hook.is_linked()) - simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process); - if (not process->smx_destroy_list_hook.is_linked()) { + simix_global->process_list.erase(pid_); + if (host_ && host_process_list_hook.is_linked()) + simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this); + if (not smx_destroy_list_hook.is_linked()) { #if SIMGRID_HAVE_MC - xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process); + xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, this); #endif - simix_global->process_to_destroy.push_back(*process); + simix_global->actors_to_destroy.push_back(*this); } - process->context_->iwannadie = false; + context_->iwannadie = false; simix_global->mutex.unlock(); } -/** - * Garbage collection - * - * Should be called some time to time to free the memory allocated for processes that have finished (or killed). - */ -void SIMIX_process_empty_trash() +void ActorImpl::exit() { - while (not simix_global->process_to_destroy.empty()) { - smx_actor_t process = &simix_global->process_to_destroy.front(); - simix_global->process_to_destroy.pop_front(); - XBT_DEBUG("Getting rid of %p",process); - intrusive_ptr_release(process); + 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 &actor->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; } -#if SIMGRID_HAVE_MC - xbt_dynar_reset(simix_global->dead_actors_vector); -#endif } -namespace simgrid { -namespace kernel { -namespace actor { - -ActorImpl::ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host) : name_(name), host_(host), piface_(this) +void ActorImpl::kill(ActorImpl* actor) { - pid_ = simix_process_maxpid++; - simcall.issuer = this; + if (actor->finished_) { + XBT_DEBUG("Ignoring request to kill actor %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->actors_to_run), end(simix_global->actors_to_run), actor) == + end(simix_global->actors_to_run) && + actor != this) { + XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); + simix_global->actors_to_run.push_back(actor); + } } -ActorImpl::~ActorImpl() +void ActorImpl::kill_all() { - delete this->context_; + 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); + XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname()); + kill_timer = simix::Timer::set(kill_time, [this] { + this->exit(); kill_timer = nullptr; }); } +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; @@ -130,7 +192,44 @@ static void dying_daemon(int /*exit_status*/, void* data) vect->pop_back(); } -/** This process will be terminated automatically when the last non-daemon process finishes */ +void ActorImpl::yield() +{ + XBT_DEBUG("Yield actor '%s'", get_cname()); + + /* Go into sleep and return control to maestro */ + context_->suspend(); + + /* Ok, maestro returned control to us */ + 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::StopRequest(); Does not seem to properly kill the actor + context_->stop(); + THROW_IMPOSSIBLE; + } + + if (suspended_) { + XBT_DEBUG("Hey! I'm suspended."); + xbt_assert(exception_ != nullptr, "Gasp! This exception may be lost by subsequent calls."); + suspended_ = false; + suspend(this); + } + + if (exception_ != nullptr) { + XBT_DEBUG("Wait, maestro left me an exception"); + std::exception_ptr exception = std::move(exception_); + exception_ = nullptr; + std::rethrow_exception(std::move(exception)); + } + + if (SMPI_switch_data_segment && not finished_) { + SMPI_switch_data_segment(iface()); + } +} + +/** This actor will be terminated automatically when the last non-daemon actor finishes */ void ActorImpl::daemonize() { if (not daemon_) { @@ -140,17 +239,17 @@ void ActorImpl::daemonize() } } -simgrid::s4u::Actor* ActorImpl::restart() +s4u::Actor* ActorImpl::restart() { - XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname()); + XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname()); - // retrieve the arguments of the old process - simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this); + // retrieve the arguments of the old actor + ProcessArg arg = ProcessArg(host_, this); - // kill the old process - SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self()); + // kill the old actor + (this == simix_global->maestro_process) ? this->exit() : SIMIX_process_self()->kill(this); - // start the new process + // start the new actor ActorImplPtr actor = ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr); actor->set_kill_time(arg.kill_time); @@ -159,7 +258,7 @@ simgrid::s4u::Actor* ActorImpl::restart() return actor->ciface(); } -smx_activity_t ActorImpl::suspend(ActorImpl* issuer) +activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer) { if (suspended_) { XBT_DEBUG("Actor '%s' is already suspended", get_cname()); @@ -182,7 +281,7 @@ smx_activity_t ActorImpl::suspend(ActorImpl* issuer) 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."); @@ -200,24 +299,34 @@ void ActorImpl::resume() XBT_OUT(); } -smx_activity_t ActorImpl::sleep(double duration) +activity::ActivityImplPtr ActorImpl::join(smx_actor_t actor, double timeout) { - if (host_->is_off()) - throw_exception(std::make_exception_ptr(simgrid::HostFailureException( - XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there."))); + 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(simgrid::kernel::resource::Action::State::FINISHED); + intrusive_ptr_release(sleep); + }, + res.get()); + return res; +} - 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); +activity::ActivityImplPtr ActorImpl::sleep(double duration) +{ + if (not host_->is_on()) + throw_exception(std::make_exception_ptr(simgrid::HostFailureException( + 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) { - exception = e; + exception_ = e; if (suspended_) resume(); @@ -225,64 +334,59 @@ void ActorImpl::throw_exception(std::exception_ptr e) /* cancel the blocking synchro if any */ if (waiting_synchro) { - simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(waiting_synchro); - if (exec != nullptr && exec->surf_action_) - exec->surf_action_->cancel(); + activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro); + if (exec != nullptr) + exec->cancel(); - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(waiting_synchro); + activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); if (comm != nullptr) { comms.remove(comm); comm->cancel(); } - simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(waiting_synchro); + activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(waiting_synchro); - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), this) == - end(simix_global->process_to_run) && + if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) == + end(simix_global->actors_to_run) && this != SIMIX_process_self()) { - XBT_DEBUG("Inserting %s in the to_run list", get_cname()); - simix_global->process_to_run.push_back(this); + XBT_DEBUG("Inserting [%p] %s in the to_run list", this, get_cname()); + simix_global->actors_to_run.push_back(this); } } - simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(waiting_synchro); + activity::RawImplPtr raw = boost::dynamic_pointer_cast(waiting_synchro); if (raw != nullptr) { SIMIX_synchro_stop_waiting(this, &simcall); } - simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(waiting_synchro); + 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) +void ActorImpl::set_host(s4u::Host* 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) +ActorImplPtr ActorImpl::create(std::string name, simix::ActorCode code, void* data, s4u::Host* host, + std::unordered_map* properties, ActorImpl* 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; } - ActorImpl* actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host); + ActorImpl* actor = new ActorImpl(simgrid::xbt::string(name), host); xbt_assert(code && host != nullptr, "Invalid parameters"); /* actor data */ @@ -290,40 +394,40 @@ ActorImplPtr ActorImpl::create(std::string name, simgrid::simix::ActorCode code, actor->code = code; if (parent_actor != nullptr) - actor->ppid_ = parent_actor->pid_; + actor->set_ppid(parent_actor->get_pid()); XBT_VERB("Create context %s", actor->get_cname()); - actor->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, actor); + actor->context_ = simix_global->context_factory->create_context(std::move(code), actor); /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) actor->set_property(kv.first, kv.second); - /* Add the process to its host's process list */ + /* Add the actor to its host's actor list */ host->pimpl_->process_list_.push_back(*actor); XBT_DEBUG("Start context '%s'", actor->get_cname()); - /* 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()); - simix_global->process_to_run.push_back(actor); + /* Now insert it in the global actor list and in the actor to run list */ + simix_global->process_list[actor->get_pid()] = actor; + XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname()); + simix_global->actors_to_run.push_back(actor); intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::Actor::on_creation(actor->iface()); + s4u::Actor::on_creation(actor->iface()); return ActorImplPtr(actor); } -void create_maestro(simgrid::simix::ActorCode code) +void create_maestro(simix::ActorCode code) { - /* Create maestro process and initialize it */ - smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr); + /* Create maestro actor and initialize it */ + ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); if (not code) { - maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro); + maestro->context_ = simix_global->context_factory->create_context(simix::ActorCode(), maestro); } else { maestro->context_ = simix_global->context_factory->create_maestro(code, maestro); } @@ -345,7 +449,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; } @@ -356,11 +460,11 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn actor->code = nullptr; if (parent_process != nullptr) - actor->ppid_ = parent_process->pid_; + actor->set_ppid(parent_process->get_pid()); XBT_VERB("Create context %s", actor->get_cname()); xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first"); - actor->context_ = simix_global->context_factory->attach(&SIMIX_process_cleanup, actor); + actor->context_ = simix_global->context_factory->attach(actor); /* Add properties */ if (properties != nullptr) @@ -371,9 +475,9 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn host->pimpl_->process_list_.push_back(*actor); /* 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()); - simix_global->process_to_run.push_back(actor); + simix_global->process_list[actor->get_pid()] = actor; + XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname()); + simix_global->actors_to_run.push_back(actor); intrusive_ptr_add_ref(actor); auto* context = dynamic_cast(actor->context_); @@ -393,109 +497,10 @@ void SIMIX_process_detach() if (context == nullptr) xbt_die("Not a suitable context"); - SIMIX_process_cleanup(context->get_actor()); + context->get_actor()->cleanup(); context->attach_stop(); } -/** - * @brief Executes the processes from simix_global->process_to_run. - * - * The processes of simix_global->process_to_run are run (in parallel if - * possible). On exit, simix_global->process_to_run is empty, and - * simix_global->process_that_ran contains the list of processes that just ran. - * The two lists are swapped so, be careful when using them before and after a - * call to this function. - */ -void SIMIX_process_runall() -{ - SIMIX_context_runall(); - - simix_global->process_to_run.swap(simix_global->process_that_ran); - 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 */ @@ -503,7 +508,7 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c { SMX_EXCEPTION(actor, cat, value, msg); - if (actor->suspended_) + if (actor->is_suspended()) actor->resume(); /* cancel the blocking synchro if any */ @@ -511,8 +516,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); @@ -525,11 +530,11 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c boost::dynamic_pointer_cast(actor->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(actor->waiting_synchro); - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) == - end(simix_global->process_to_run) && + if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) == + end(simix_global->actors_to_run) && actor != SIMIX_process_self()) { - XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); - simix_global->process_to_run.push_back(actor); + XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname()); + simix_global->actors_to_run.push_back(actor); } } @@ -542,24 +547,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 simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { smx_activity_t sync_suspend = actor->suspend(simcall->issuer); @@ -618,26 +611,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()) { @@ -655,7 +633,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(); @@ -670,47 +648,13 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) * * @param self the current process */ -void SIMIX_process_yield(smx_actor_t self) -{ - XBT_DEBUG("Yield actor '%s'", self->get_cname()); - - /* Go into sleep and return control to maestro */ - self->context_->suspend(); - - /* Ok, maestro returned control to us */ - XBT_DEBUG("Control returned to me: '%s'", self->get_cname()); - - if (self->context_->iwannadie) { - - XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname()); - // throw simgrid::kernel::context::StopRequest(); Does not seem to properly kill the actor - self->context_->stop(); - THROW_IMPOSSIBLE; - } - - if (self->suspended_) { - XBT_DEBUG("Hey! I'm suspended."); - xbt_assert(self->exception != nullptr, "Gasp! This exception may be lost by subsequent calls."); - self->suspended_ = false; - self->suspend(self); - } - - if (self->exception != nullptr) { - XBT_DEBUG("Wait, maestro left me an exception"); - std::exception_ptr exception = std::move(self->exception); - self->exception = nullptr; - std::rethrow_exception(std::move(exception)); - } - - if (SMPI_switch_data_segment && not self->finished_) { - SMPI_switch_data_segment(self->iface()); - } -} -/** @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; + return simix_global->actors_to_run; } /** @brief Returns the process from PID. */ @@ -752,7 +696,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(); }); }