X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fa1717d674d45f694ea8637db1a32afcbd6cc8c..791d2a621277a221aa84be5602565208ca441f44:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index ec224ed131..b01c51aab2 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -1,48 +1,49 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #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" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #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" -#include "xbt/ex.hpp" - -#ifdef HAVE_SMPI -#include "src/smpi/include/private.hpp" -#endif #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); -unsigned long simix_process_maxpid = 0; +static unsigned long simix_process_maxpid = 0; /** - * \brief Returns the current agent. + * @brief Returns the current agent. * * This functions returns the currently running SIMIX process. * - * \return The SIMIX process + * @return The SIMIX process */ smx_actor_t SIMIX_process_self() { - smx_context_t self_context = SIMIX_context_self(); + smx_context_t self_context = simgrid::kernel::context::Context::self(); - return (self_context != nullptr) ? self_context->process() : nullptr; + return (self_context != nullptr) ? self_context->get_actor() : nullptr; } /** - * \brief Returns whether a process has pending asynchronous communications. - * \return true if there are asynchronous communications in this process + * @brief Returns whether a process has pending asynchronous communications. + * @return true if there are asynchronous communications in this process */ int SIMIX_process_has_pending_comms(smx_actor_t process) { @@ -50,67 +51,27 @@ int SIMIX_process_has_pending_comms(smx_actor_t process) { } /** - * \brief Moves a process to the list of processes to destroy. + * @brief Moves a process to the list of processes to destroy. */ void SIMIX_process_cleanup(smx_actor_t process) { - XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, + XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process, process->waiting_synchro.get()); - process->finished = true; - SIMIX_process_on_exit_runall(process); - - /* Unregister from the kill timer if any */ - if (process->kill_timer != nullptr) { - SIMIX_timer_remove(process->kill_timer); - process->kill_timer = nullptr; - } - - xbt_os_mutex_acquire(simix_global->mutex); - - /* cancel non-blocking communications */ - while (not process->comms.empty()) { - smx_activity_t synchro = process->comms.front(); - process->comms.pop_front(); - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - - /* make sure no one will finish the comm after this process is destroyed, - * because src_proc or dst_proc would be an invalid pointer */ - - if (comm->src_proc == process) { - XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(), - comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc); - comm->src_proc = nullptr; - - } else if (comm->dst_proc == process) { - XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_, - comm->src_proc, comm->dst_proc); - comm->dst_proc = nullptr; - - if (comm->detached && comm->src_proc != nullptr) { - /* the comm will be freed right now, remove it from the sender */ - comm->src_proc->comms.remove(comm); - } - } else { - xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get()); - } - comm->cancel(); - } + simix_global->mutex.lock(); - XBT_DEBUG("%p should not be run anymore",process); - simix_global->process_list.erase(process->pid); - if (process->host && process->host_process_list_hook.is_linked()) - simgrid::xbt::intrusive_erase(process->host->extension()->process_list, *process); + 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()) { #if SIMGRID_HAVE_MC xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process); #endif simix_global->process_to_destroy.push_back(*process); } - process->context->iwannadie = 0; + process->context_->iwannadie = false; - xbt_os_mutex_release(simix_global->mutex); + simix_global->mutex.unlock(); } /** @@ -132,16 +93,32 @@ void SIMIX_process_empty_trash() } namespace simgrid { - namespace kernel { namespace actor { +ActorImpl::ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host) : name_(name), host_(host), piface_(this) +{ + pid_ = simix_process_maxpid++; + simcall.issuer = this; +} + ActorImpl::~ActorImpl() { - delete this->context; + delete this->context_; +} + +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); + kill_timer = nullptr; + }); } -static int dying_daemon(void* exit_status, void* data) +static void dying_daemon(int /*exit_status*/, void* data) { std::vector* vect = &simix_global->daemons; @@ -151,14 +128,13 @@ static int dying_daemon(void* exit_status, void* data) /* Don't move the whole content since we don't really care about the order */ std::swap(*it, vect->back()); vect->pop_back(); - - return 0; } + /** This process will be terminated automatically when the last non-daemon process finishes */ void ActorImpl::daemonize() { - if (not daemon) { - daemon = true; + if (not daemon_) { + daemon_ = true; simix_global->daemons.push_back(this); SIMIX_process_on_exit(this, dying_daemon, this); } @@ -166,41 +142,31 @@ void ActorImpl::daemonize() simgrid::s4u::Actor* ActorImpl::restart() { - XBT_DEBUG("Restarting process %s on %s", get_cname(), host->get_cname()); + XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname()); // retrieve the arguments of the old process - // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - simgrid::kernel::actor::ProcessArg arg; - arg.name = name; - arg.code = code; - arg.host = host; - arg.kill_time = SIMIX_timer_get_date(kill_timer); - arg.data = userdata; - arg.properties = nullptr; - arg.auto_restart = auto_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()); // start the new process - ActorImpl* actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, - arg.properties.get(), nullptr); - if (arg.kill_time >= 0) - simcall_process_set_kill_time(actor, arg.kill_time); - if (arg.auto_restart) - actor->auto_restart = arg.auto_restart; + 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); + actor->set_auto_restart(arg.auto_restart); return actor->ciface(); } smx_activity_t ActorImpl::suspend(ActorImpl* issuer) { - if (suspended) { - XBT_DEBUG("Actor '%s' is already suspended", name.c_str()); + if (suspended_) { + XBT_DEBUG("Actor '%s' is already suspended", get_cname()); return nullptr; } - suspended = 1; + suspended_ = true; /* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */ if (this != issuer) { @@ -210,7 +176,7 @@ 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); } } @@ -218,14 +184,14 @@ void ActorImpl::resume() { XBT_IN("process = %p", this); - if (context->iwannadie) { + if (context_->iwannadie) { XBT_VERB("Ignoring request to suspend an actor that is currently dying."); return; } - if (not suspended) + if (not suspended_) return; - suspended = 0; + suspended_ = false; /* resume the synchronization that was blocking the resumed actor. */ if (waiting_synchro) @@ -236,117 +202,137 @@ void ActorImpl::resume() smx_activity_t ActorImpl::sleep(double duration) { - if (host->is_off()) - THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->get_cname()); - - simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); - synchro->host = host; - synchro->surf_sleep = host->pimpl_cpu->sleep(duration); - synchro->surf_sleep->set_data(synchro); - XBT_DEBUG("Create sleep synchronization %p", synchro); + 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."))); - return synchro; + return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_)) + ->start(duration); } -void create_maestro(std::function code) +void ActorImpl::throw_exception(std::exception_ptr e) { - smx_actor_t maestro = nullptr; - /* Create maestro process and initialize it */ - maestro = new simgrid::kernel::actor::ActorImpl(); - maestro->pid = simix_process_maxpid++; - maestro->name = ""; - maestro->setUserData(nullptr); + exception = e; - if (not code) { - maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); - } else { - if (not simix_global) - xbt_die("simix is not initialized, please call MSG_init first"); - maestro->context = simix_global->context_factory->create_maestro(code, maestro); - } + if (suspended_) + resume(); - maestro->simcall.issuer = maestro; - simix_global->maestro_process = maestro; -} + /* cancel the blocking synchro if any */ + if (waiting_synchro) { -} // namespace actor -} + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(waiting_synchro); + if (exec != nullptr && exec->surf_action_) + exec->surf_action_->cancel(); + + simgrid::kernel::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); + 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) && + this != SIMIX_process_self()) { + XBT_DEBUG("Inserting %s in the to_run list", get_cname()); + simix_global->process_to_run.push_back(this); + } + } + + simgrid::kernel::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); + if (io != nullptr) { + delete io.get(); + } + } + waiting_synchro = nullptr; } -/** @brief Creates and runs the maestro process */ -void SIMIX_maestro_create(void (*code)(void*), void* data) +void ActorImpl::set_host(sg_host_t dest) { - simgrid::kernel::actor::create_maestro(std::bind(code, data)); + simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this); + host_ = dest; + dest->pimpl_->process_list_.push_back(*this); } -/** - * \brief Internal function to create a process. - * - * This function actually creates the process. - * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs, - * or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context. - * - * \return the process created - */ -smx_actor_t SIMIX_process_create(const char* name, std::function code, void* data, simgrid::s4u::Host* host, - std::map* properties, smx_actor_t parent_process) +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 process %s on host '%s'", name, host->get_cname()); + XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); if (host->is_off()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->get_cname()); + XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name.c_str(), host->get_cname()); return nullptr; } - smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); + ActorImpl* actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host); xbt_assert(code && host != nullptr, "Invalid parameters"); - /* Process data */ - process->pid = simix_process_maxpid++; - process->name = simgrid::xbt::string(name); - process->host = host; - process->setUserData(data); - process->simcall.issuer = process; - - if (parent_process != nullptr) { - process->ppid = parent_process->pid; - } + /* actor data */ + actor->set_user_data(data); + actor->code = code; - process->code = code; + if (parent_actor != nullptr) + actor->ppid_ = parent_actor->pid_; - XBT_VERB("Create context %s", process->name.c_str()); - process->context = SIMIX_context_new(std::move(code), simix_global->cleanup_process_function, process); + XBT_VERB("Create context %s", actor->get_cname()); + actor->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, actor); /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) - process->setProperty(kv.first, kv.second); - - /* Make sure that the process is initialized for simix, in case we are called from the Host::onCreation signal */ - if (host->extension() == nullptr) - host->extension_set(new simgrid::simix::Host()); + actor->set_property(kv.first, kv.second); /* Add the process to its host's process list */ - host->extension()->process_list.push_back(*process); + host->pimpl_->process_list_.push_back(*actor); - XBT_DEBUG("Start context '%s'", process->name.c_str()); + 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[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); - simix_global->process_to_run.push_back(process); - intrusive_ptr_add_ref(process); + 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); + intrusive_ptr_add_ref(actor); - /* The onCreation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes - simgrid::s4u::Actor::on_creation(tmp); + /* The on_creation() signal must be delayed until there, where the pid and everything is set */ + simgrid::s4u::Actor::on_creation(actor->iface()); + + return ActorImplPtr(actor); +} + +void create_maestro(simgrid::simix::ActorCode code) +{ + /* Create maestro process and initialize it */ + smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr); + + if (not code) { + maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro); + } else { + maestro->context_ = simix_global->context_factory->create_maestro(code, maestro); + } + + maestro->simcall.issuer = maestro; + simix_global->maestro_process = maestro; +} - return process; +} // namespace actor +} // namespace kernel } smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, - std::map* properties, smx_actor_t parent_process) + std::unordered_map* properties, smx_actor_t parent_process) { // This is mostly a copy/paste from SIMIX_process_new(), // it'd be nice to share some code between those two functions. @@ -359,67 +345,55 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn return nullptr; } - smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); - /* Process data */ - process->pid = simix_process_maxpid++; - process->name = std::string(name); - process->host = host; - process->setUserData(data); - process->simcall.issuer = process; + smx_actor_t actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host); + /* Actor data */ + actor->set_user_data(data); + actor->code = nullptr; - if (parent_process != nullptr) { - process->ppid = parent_process->pid; - } + if (parent_process != nullptr) + actor->ppid_ = parent_process->pid_; - /* Process data for auto-restart */ - process->code = nullptr; - - XBT_VERB("Create context %s", process->name.c_str()); - if (not simix_global) - xbt_die("simix is not initialized, please call MSG_init first"); - process->context = simix_global->context_factory->attach(simix_global->cleanup_process_function, process); + 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); /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) - process->setProperty(kv.first, kv.second); + actor->set_property(kv.first, kv.second); /* Add the process to it's host process list */ - host->extension()->process_list.push_back(*process); + 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[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); - simix_global->process_to_run.push_back(process); - intrusive_ptr_add_ref(process); - - - auto* context = dynamic_cast(process->context); - if (not context) - xbt_die("Not a suitable context"); + 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); + intrusive_ptr_add_ref(actor); + auto* context = dynamic_cast(actor->context_); + xbt_assert(nullptr != context, "Not a suitable context"); context->attach_start(); - /* The onCreation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes + /* 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); - return process; + return actor; } void SIMIX_process_detach() { - auto* context = dynamic_cast(SIMIX_context_self()); - if (not context) + auto* context = dynamic_cast(simgrid::kernel::context::Context::self()); + if (context == nullptr) xbt_die("Not a suitable context"); - auto process = context->process(); - simix_global->cleanup_process_function(process); + SIMIX_process_cleanup(context->get_actor()); context->attach_stop(); } /** - * \brief Executes the processes from simix_global->process_to_run. + * @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 @@ -436,43 +410,49 @@ void SIMIX_process_runall() } /** - * \brief Internal function to kill a SIMIX process. + * @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 process poor victim - * \param issuer the process which has sent the PROCESS_KILL. Important to not schedule twice the same process. + * @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 process, smx_actor_t issuer) { +void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer) +{ - if (process->finished) { - XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->get_cname(), - process->host->get_cname()); + 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->get_cname(), issuer->host->get_cname(), - process->get_cname(), process->host->get_cname()); + 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()); - process->context->iwannadie = 1; - process->blocked = 0; - process->suspended = 0; - process->exception = nullptr; + 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 (process->waiting_synchro != nullptr) { + if (actor->waiting_synchro != nullptr) { simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (exec != nullptr) { if (exec->surf_action_) { @@ -481,93 +461,91 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { exec->surf_action_ = nullptr; } } else if (comm != nullptr) { - process->comms.remove(process->waiting_synchro); + actor->comms.remove(actor->waiting_synchro); comm->cancel(); // Remove first occurrence of &process->simcall: - auto i = boost::range::find(process->waiting_synchro->simcalls_, &process->simcall); - if (i != process->waiting_synchro->simcalls_.end()) - process->waiting_synchro->simcalls_.remove(&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) { - SIMIX_process_sleep_destroy(process->waiting_synchro); - + if (sleep->surf_action_) + sleep->surf_action_->cancel(); + sleep->post(); } else if (raw != nullptr) { - SIMIX_synchro_stop_waiting(process, &process->simcall); + SIMIX_synchro_stop_waiting(actor, &actor->simcall); } else if (io != nullptr) { - SIMIX_io_destroy(process->waiting_synchro); + delete io.get(); } else { - xbt_die("Unknown type of activity"); + 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()); } - process->waiting_synchro = nullptr; + actor->waiting_synchro = nullptr; } - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), process) == + if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) == end(simix_global->process_to_run) && - process != issuer) { - XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); - simix_global->process_to_run.push_back(process); + actor != issuer) { + XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); + simix_global->process_to_run.push_back(actor); } } -/** @brief Ask another process to raise the given exception - * - * @param process The process that should raise that exception - * @param cat category of exception - * @param value value associated to the exception - * @param msg string information associated to the exception - */ -void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char *msg) { - SMX_EXCEPTION(process, cat, value, msg); +/** @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) +{ + SMX_EXCEPTION(actor, cat, value, msg); - if (process->suspended) - process->resume(); + if (actor->suspended_) + actor->resume(); /* cancel the blocking synchro if any */ - if (process->waiting_synchro) { + if (actor->waiting_synchro) { simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (exec != nullptr && exec->surf_action_) exec->surf_action_->cancel(); simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (comm != nullptr) { - process->comms.remove(comm); + actor->comms.remove(comm); comm->cancel(); } simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (sleep != nullptr) { - SIMIX_process_sleep_destroy(process->waiting_synchro); - if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), process) == + 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) && - process != SIMIX_process_self()) { - XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); - simix_global->process_to_run.push_back(process); + actor != SIMIX_process_self()) { + XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); + simix_global->process_to_run.push_back(actor); } } simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (raw != nullptr) { - SIMIX_synchro_stop_waiting(process, &process->simcall); + SIMIX_synchro_stop_waiting(actor, &actor->simcall); } simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(process->waiting_synchro); + boost::dynamic_pointer_cast(actor->waiting_synchro); if (io != nullptr) { - SIMIX_io_destroy(process->waiting_synchro); + delete io.get(); } } - process->waiting_synchro = nullptr; - + actor->waiting_synchro = nullptr; } /** - * \brief Kills all running processes. - * \param issuer this one will not be killed + * @brief Kills all running processes. + * @param issuer this one will not be killed */ void SIMIX_process_killall(smx_actor_t issuer) { @@ -576,24 +554,17 @@ void SIMIX_process_killall(smx_actor_t 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->extension()->process_list, *actor); - actor->host = dest; - dest->extension()->process_list.push_back(*actor); -} -void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process) +void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) { - smx_activity_t sync_suspend = process->suspend(simcall->issuer); + smx_activity_t sync_suspend = actor->suspend(simcall->issuer); - if (process != simcall->issuer) { + if (actor != simcall->issuer) { SIMIX_simcall_answer(simcall); } else { sync_suspend->simcalls_.push_back(simcall); - process->waiting_synchro = sync_suspend; - process->waiting_synchro->suspend(); + actor->waiting_synchro = sync_suspend; + actor->waiting_synchro->suspend(); } /* If we are suspending ourselves, then just do not finish the simcall now */ } @@ -611,15 +582,15 @@ void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); - if (not self) { + if (self == nullptr) { return nullptr; } - return self->getUserData(); + return self->get_user_data(); } void SIMIX_process_self_set_data(void *data) { - SIMIX_process_self()->setUserData(data); + SIMIX_process_self()->set_user_data(data); } @@ -631,12 +602,12 @@ const char* SIMIX_process_self_get_name() { if (process == nullptr || process == simix_global->maestro_process) return "maestro"; - return process->name.c_str(); + return process->get_cname(); } void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout) { - if (process->finished) { + if (process->finished_) { // The joined process is already finished, just wake up the issuer process right away simcall_process_sleep__set__result(simcall, SIMIX_DONE); SIMIX_simcall_answer(simcall); @@ -652,12 +623,11 @@ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl smx_activity_t res = issuer->sleep(timeout); intrusive_ptr_add_ref(res.get()); SIMIX_process_on_exit(process, - [](void*, void* arg) { + [](int, void* arg) { auto sleep = static_cast(arg); - if (sleep->surf_sleep) - sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED); + if (sleep->surf_action_) + sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED); intrusive_ptr_release(sleep); - return 0; }, res.get()); return res; @@ -682,48 +652,41 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) simgrid::kernel::activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(synchro); - if (sleep->surf_sleep) { - sleep->surf_sleep->unref(); - sleep->surf_sleep = nullptr; + if (sleep->surf_action_) { + sleep->surf_action_->unref(); + sleep->surf_action_ = nullptr; } } /** - * \brief Calling this function makes the process to yield. + * @brief Calling this function makes the process to yield. * * Only the current process can call this function, giving back the control to maestro. * - * \param self the current process + * @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(); + self->context_->suspend(); /* Ok, maestro returned control to us */ - XBT_DEBUG("Control returned to me: '%s'", self->name.c_str()); - - if (self->context->iwannadie){ - XBT_DEBUG("I wanna die!"); - self->finished = true; - /* execute the on_exit functions */ - SIMIX_process_on_exit_runall(self); - /* Add the process to the list of process to restart, only if the host is down */ - if (self->auto_restart && self->host->is_off()) { - SIMIX_host_add_auto_restart_process(self->host, self->get_cname(), self->code, self->getUserData(), - SIMIX_timer_get_date(self->kill_timer), self->getProperties(), - self->auto_restart); - } - XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host->get_cname()); - self->context->stop(); + 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) { + 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 = 0; + self->suspended_ = false; self->suspend(self); } @@ -734,7 +697,7 @@ void SIMIX_process_yield(smx_actor_t self) std::rethrow_exception(std::move(exception)); } - if (SMPI_switch_data_segment && not self->finished) { + if (SMPI_switch_data_segment && not self->finished_) { SMPI_switch_data_segment(self->iface()); } } @@ -748,73 +711,47 @@ const std::vector& simgrid::simix::process_get_runnable() /** @brief Returns the process from PID. */ smx_actor_t SIMIX_process_from_PID(aid_t PID) { - auto process = simix_global->process_list.find(PID); - return process == simix_global->process_list.end() ? nullptr : process->second; + auto actor = simix_global->process_list.find(PID); + return actor == simix_global->process_list.end() ? nullptr : actor->second; } -void SIMIX_process_on_exit_runall(smx_actor_t process) { - simgrid::s4u::Actor::on_destruction(process->iface()); - smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; - while (not process->on_exit.empty()) { - s_smx_process_exit_fun_t exit_fun = process->on_exit.back(); - process->on_exit.pop_back(); - (exit_fun.fun)((void*)exit_status, exit_fun.arg); - } +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); } -void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data) { - xbt_assert(process, "current process not found: are you in maestro context ?"); - - s_smx_process_exit_fun_t exit_fun = {fun, data}; - - process->on_exit.push_back(exit_fun); -} +void SIMIX_process_on_exit(smx_actor_t actor, std::function fun, void* data) +{ + xbt_assert(actor, "current process not found: are you in maestro context ?"); -/** - * \brief Sets the auto-restart status of the process. - * If set to 1, the process will be automatically restarted when its host comes back. - */ -void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart) { - process->auto_restart = auto_restart; + actor->on_exit.emplace_back(s_smx_process_exit_fun_t{fun, data}); } /** @brief Restart a process, starting it again from the beginning. */ /** - * \ingroup simix_process_management - * \brief Creates and runs a new SIMIX process. + * @ingroup simix_process_management + * @brief Creates and runs a new SIMIX process. * * The structure and the corresponding thread are created and put in the list of ready processes. * - * \param name a name for the process. It is for user-level information and can be nullptr. - * \param code the main function of the process - * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can + * @param name a name for the process. It is for user-level information and can be nullptr. + * @param code the main function of the process + * @param data a pointer to any data one may want to attach to the new object. It is for user-level information and can * be nullptr. * It can be retrieved with the method ActorImpl::getUserData(). - * \param host where the new agent is executed. - * \param argc first argument passed to \a code - * \param argv second argument passed to \a code - * \param properties the properties of the process + * @param host where the new agent is executed. + * @param properties the properties of the process */ -smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, - char** argv, std::map* properties) -{ - if (name == nullptr) - name = ""; - auto wrapped_code = simgrid::xbt::wrapMain(code, argc, argv); - for (int i = 0; i != argc; ++i) - xbt_free(argv[i]); - xbt_free(argv); - smx_actor_t res = simcall_process_create(name, std::move(wrapped_code), data, host, properties); - return res; -} - -smx_actor_t simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, - std::map* properties) +smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data, sg_host_t host, + std::unordered_map* properties) { - if (name == nullptr) - name = ""; smx_actor_t self = SIMIX_process_self(); return simgrid::simix::simcall([name, code, data, host, properties, self] { - return SIMIX_process_create(name, std::move(code), data, host, properties, self); + return simgrid::kernel::actor::ActorImpl::create(name, std::move(code), data, host, properties, self).get(); }); } + +void simcall_process_set_data(smx_actor_t process, void* data) +{ + simgrid::simix::simcall([process, data] { process->set_user_data(data); }); +}