X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5c102f3397e8112b97c27981bfdbcaac76d79f6..4e7df12e1e81b2ff9212175628873d6d880b6630:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 53caa705a7..5f5bb5958e 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -19,11 +19,10 @@ #include "src/surf/cpu_interface.hpp" #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); -static unsigned long simix_process_maxpid = 0; - /** * @brief Returns the current agent. * @@ -38,28 +37,32 @@ smx_actor_t SIMIX_process_self() 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 - * @deprecated - */ -int SIMIX_process_has_pending_comms(smx_actor_t process) -{ - - return process->comms.size() > 0; -} - namespace simgrid { namespace kernel { namespace actor { -ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this) +static unsigned long maxpid = 0; +int get_maxpid() { - pid_ = simix_process_maxpid++; - simcall.issuer = this; + return maxpid; } -ActorImpl::~ActorImpl() = default; +ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this) +{ + pid_ = maxpid++; + simcall.issuer_ = this; +} + +ActorImpl::~ActorImpl() +{ + if (simix_global != nullptr && this != simix_global->maestro_process) { + if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */ + context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops + simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); + if (context_.get() != nullptr) + context_->iwannadie = true; + } +} /* Become an actor in the simulation * @@ -70,7 +73,7 @@ ActorImpl::~ActorImpl() = default; */ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* host, - std::unordered_map* properties) + const std::unordered_map* properties) { // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions. @@ -78,14 +81,13 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h if (not host->is_on()) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname()); - std::rethrow_exception( - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."))); + throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } ActorImpl* actor = new ActorImpl(xbt::string(name), host); /* Actor data */ actor->set_user_data(data); - actor->code = nullptr; + actor->code_ = nullptr; XBT_VERB("Create context %s", actor->get_cname()); xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first"); @@ -93,11 +95,10 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h /* Add properties */ if (properties != nullptr) - for (auto const& kv : *properties) - actor->set_property(kv.first, kv.second); + actor->set_properties(*properties); /* Add the process to it's host process list */ - host->pimpl_->process_list_.push_back(*actor); + host->pimpl_->add_actor(actor); /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[actor->get_pid()] = actor; @@ -140,13 +141,14 @@ void ActorImpl::cleanup() watched_hosts.insert(get_host()->get_name()); } - // Execute the termination callbacks - bool failed = context_->iwannadie; - while (not on_exit.empty()) { - auto exit_fun = on_exit.back(); - on_exit.pop_back(); - exit_fun(failed); + if (on_exit) { + // Execute the termination callbacks + bool failed = context_->iwannadie; + for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun) + (*exit_fun)(failed); + on_exit.reset(); } + undaemonize(); /* cancel non-blocking activities */ for (auto activity : comms) @@ -169,8 +171,8 @@ void ActorImpl::cleanup() simix_global->mutex.lock(); simix_global->process_list.erase(pid_); - if (host_ && host_process_list_hook.is_linked()) - simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this); + if (host_ && host_actor_list_hook.is_linked()) + host_->pimpl_->remove_actor(this); if (not smx_destroy_list_hook.is_linked()) { #if SIMGRID_HAVE_MC xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this); @@ -181,61 +183,46 @@ void ActorImpl::cleanup() simix_global->mutex.unlock(); context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); + simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); }); context_->iwannadie = true; } 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(ForcefulKillException("host failed"))); - /* destroy the blocking synchro if any */ if (waiting_synchro != nullptr) { + waiting_synchro->cancel(); + waiting_synchro->state_ = SIMIX_FAILED; 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; + + if (exec != nullptr) { + exec->clean_action(); } 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) { - raw->finish(); - } 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()); + activity::ActivityImplPtr(waiting_synchro)->finish(); } waiting_synchro = nullptr; } + + // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that + this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed"))); } void ActorImpl::kill(ActorImpl* actor) { + xbt_assert(actor != simix_global->maestro_process, "Killing maestro is a rather bad idea"); if (actor->finished_) { XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(), actor->host_->get_cname()); @@ -300,7 +287,7 @@ void ActorImpl::yield() xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls."); suspended_ = false; - suspend(this); + suspend(); } if (exception_ != nullptr) { @@ -321,15 +308,20 @@ void ActorImpl::daemonize() if (not daemon_) { daemon_ = true; simix_global->daemons.push_back(this); - SIMIX_process_on_exit(this, [this](bool) { - auto& vect = simix_global->daemons; - auto it = std::find(vect.begin(), vect.end(), this); - xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug."); - - /* Don't move the whole content since we don't really care about the order */ - std::swap(*it, vect.back()); - vect.pop_back(); - }); + } +} + +void ActorImpl::undaemonize() +{ + if (daemon_) { + auto& vect = simix_global->daemons; + auto it = std::find(vect.begin(), vect.end(), this); + xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug."); + /* Don't move the whole content since we don't really care about the order */ + + std::swap(*it, vect.back()); + vect.pop_back(); + daemon_ = false; } } @@ -348,31 +340,31 @@ s4u::Actor* ActorImpl::restart() // start the new actor ActorImplPtr actor = ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr); + *actor->on_exit = std::move(*arg.on_exit); actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); return actor->ciface(); } -activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer) +void ActorImpl::suspend() { if (suspended_) { XBT_DEBUG("Actor '%s' is already suspended", get_cname()); - return nullptr; + return; } suspended_ = true; - /* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */ - if (this != issuer) { - if (waiting_synchro) - waiting_synchro->suspend(); - /* If the other actor is not waiting, its suspension is delayed to when the actor is rescheduled. */ + /* If the suspended actor is waiting on a sync, suspend its synchronization. */ + if (waiting_synchro == nullptr) { + auto exec = new activity::ExecImpl(); + exec->set_name("suspend").set_host(host_).set_flops_amount(0.0).start(); + waiting_synchro = activity::ExecImplPtr(exec); - return nullptr; - } else { - return activity::ExecImplPtr(new activity::ExecImpl())->set_name("suspend")->set_host(host_)->start(0.0, 1.0, 0.0); + waiting_synchro->simcalls_.push_back(&simcall); } + waiting_synchro->suspend(); } void ActorImpl::resume() @@ -411,11 +403,9 @@ activity::ActivityImplPtr ActorImpl::sleep(double duration) throw_exception(std::make_exception_ptr(simgrid::HostFailureException( XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); - return activity::SleepImplPtr(new activity::SleepImpl()) - ->set_name("sleep") - ->set_host(host_) - ->set_duration(duration) - ->start(); + auto sleep = new activity::SleepImpl(); + sleep->set_name("sleep").set_host(host_).set_duration(duration).start(); + return activity::SleepImplPtr(sleep); } void ActorImpl::throw_exception(std::exception_ptr e) @@ -427,46 +417,36 @@ void ActorImpl::throw_exception(std::exception_ptr e) /* cancel the blocking synchro if any */ if (waiting_synchro) { - - activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro); - if (exec != nullptr) - exec->cancel(); + waiting_synchro->cancel(); activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); - if (comm != nullptr) { - comms.remove(comm); - comm->cancel(); - } - activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(waiting_synchro); - if (sleep != nullptr) { - SIMIX_process_sleep_destroy(sleep); - 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 [%p] %s in the to_run list", this, get_cname()); - simix_global->actors_to_run.push_back(this); - } - } + if (comm != nullptr) + comms.remove(comm); - activity::RawImplPtr raw = boost::dynamic_pointer_cast(waiting_synchro); - if (raw != nullptr) { - raw->finish(); - } + waiting_synchro = nullptr; + } +} - activity::IoImplPtr io = boost::dynamic_pointer_cast(waiting_synchro); - if (io != nullptr) { - io->cancel(); - } +void ActorImpl::simcall_answer() +{ + if (this != simix_global->maestro_process){ + XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call_), (int)simcall.call_, + get_cname(), this); + simcall.call_ = SIMCALL_NONE; + xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) || + std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) == + end(simix_global->actors_to_run), + "Actor %p should not exist in actors_to_run!", this); + simix_global->actors_to_run.push_back(this); } - waiting_synchro = nullptr; } void ActorImpl::set_host(s4u::Host* dest) { - xbt::intrusive_erase(host_->pimpl_->process_list_, *this); + host_->pimpl_->remove_actor(this); host_ = dest; - dest->pimpl_->process_list_.push_back(*this); + dest->pimpl_->add_actor(this); } ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) @@ -488,18 +468,17 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) if (not host_->is_on()) { XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname()); intrusive_ptr_release(this); - std::rethrow_exception( - std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."))); + throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."); } - this->code = code; + this->code_ = code; XBT_VERB("Create context %s", get_cname()); context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this)); XBT_DEBUG("Start context '%s'", get_cname()); /* Add the actor to its host's actor list */ - host_->pimpl_->process_list_.push_back(*this); + host_->pimpl_->add_actor(this); simix_global->process_list[pid_] = this; /* Now insert it in the global actor list and in the actor to run list */ @@ -510,7 +489,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) } ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host, - std::unordered_map* properties, ActorImpl* parent_actor) + const std::unordered_map* properties, ActorImpl* parent_actor) { XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); @@ -525,8 +504,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& /* Add properties */ if (properties != nullptr) - for (auto const& kv : *properties) - actor->set_property(kv.first, kv.second); + actor->set_properties(*properties); actor->start(code); @@ -544,7 +522,7 @@ void create_maestro(const std::function& code) maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro)); } - maestro->simcall.issuer = maestro; + maestro->simcall.issuer_ = maestro; simix_global->maestro_process = maestro; } @@ -552,94 +530,12 @@ void create_maestro(const std::function& code) } // namespace kernel } // namespace simgrid -void SIMIX_process_detach() -{ - simgrid::kernel::actor::ActorImpl::detach(); -} - -smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, - std::unordered_map* properties, - smx_actor_t /*parent_process*/) -{ - return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get(); -} - -/** @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 (actor->is_suspended()) - actor->resume(); - - /* cancel the blocking synchro if any */ - if (actor->waiting_synchro) { - - simgrid::kernel::activity::ExecImplPtr exec = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (exec != nullptr) - exec->cancel(); - - simgrid::kernel::activity::CommImplPtr comm = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (comm != nullptr) { - actor->comms.remove(comm); - comm->cancel(); - } - - simgrid::kernel::activity::SleepImplPtr sleep = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (sleep != nullptr) { - SIMIX_process_sleep_destroy(sleep); - 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 [%p] %s in the to_run list", actor, actor->get_cname()); - simix_global->actors_to_run.push_back(actor); - } - } - - simgrid::kernel::activity::RawImplPtr raw = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (raw != nullptr) { - raw->finish(); - } - - simgrid::kernel::activity::IoImplPtr io = - boost::dynamic_pointer_cast(actor->waiting_synchro); - if (io != nullptr) { - io->cancel(); - } - } - actor->waiting_synchro = nullptr; -} - -void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor) -{ - smx_activity_t sync_suspend = actor->suspend(simcall->issuer); - - if (actor != simcall->issuer) { - SIMIX_simcall_answer(simcall); - } else { - sync_suspend->simcalls_.push_back(simcall); - actor->waiting_synchro = sync_suspend; - actor->waiting_synchro->suspend(); - } - /* If we are suspending ourselves, then just do not finish the simcall now */ -} - -int SIMIX_process_get_maxpid() -{ - return simix_process_maxpid; -} - int SIMIX_process_count() { return simix_global->process_list.size(); } -void* SIMIX_process_self_get_data() // deprecated +void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); @@ -649,7 +545,7 @@ void* SIMIX_process_self_get_data() // deprecated return self->get_user_data(); } -void SIMIX_process_self_set_data(void* data) // deprecated +void SIMIX_process_self_set_data(void* data) { SIMIX_process_self()->set_user_data(data); } @@ -658,48 +554,7 @@ void SIMIX_process_self_set_data(void* data) // deprecated by exceptions and logging events */ const char* SIMIX_process_self_get_name() { - - smx_actor_t process = SIMIX_process_self(); - if (process == nullptr || process == simix_global->maestro_process) - return "maestro"; - - return process->get_cname(); -} - -void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout) -{ - 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); - return; - } - smx_activity_t sync = simcall->issuer->join(process, timeout); - sync->simcalls_.push_back(simcall); - simcall->issuer->waiting_synchro = sync; -} - -void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) -{ - if (MC_is_active() || MC_record_replay_is_active()) { - MC_process_clock_add(simcall->issuer, duration); - simcall_process_sleep__set__result(simcall, SIMIX_DONE); - SIMIX_simcall_answer(simcall); - return; - } - smx_activity_t sync = simcall->issuer->sleep(duration); - sync->simcalls_.push_back(simcall); - simcall->issuer->waiting_synchro = sync; -} - -void SIMIX_process_sleep_destroy(simgrid::kernel::activity::SleepImplPtr sleep) -{ - XBT_DEBUG("Destroy sleep synchro %p", sleep.get()); - - if (sleep->surf_action_) { - sleep->surf_action_->unref(); - sleep->surf_action_ = nullptr; - } + return SIMIX_is_maestro() ? "maestro" : SIMIX_process_self()->get_cname(); } /** @@ -710,38 +565,23 @@ void SIMIX_process_sleep_destroy(simgrid::kernel::activity::SleepImplPtr sleep) * @param self the current process */ -/** @brief Returns the list of processes to run. - * @deprecated - */ -const std::vector& simgrid::simix::process_get_runnable() -{ - return simix_global->actors_to_run; -} - /** @brief Returns the process from PID. */ smx_actor_t SIMIX_process_from_PID(aid_t PID) { - auto actor = simix_global->process_list.find(PID); - return actor == simix_global->process_list.end() ? nullptr : actor->second; -} - -void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data) -{ - SIMIX_process_on_exit(actor, [fun, data](bool failed) { - intptr_t status = failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; - fun(reinterpret_cast(status), data); - }); -} - -void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) -{ - SIMIX_process_on_exit(actor, [fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); }); + auto item = simix_global->process_list.find(PID); + if (item == simix_global->process_list.end()) { + for (auto& a : simix_global->actors_to_destroy) + if (a.get_pid() == PID) + return &a; + return nullptr; // Not found, even in the trash + } + return item->second; } void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun) { xbt_assert(actor, "current process not found: are you in maestro context ?"); - actor->on_exit.emplace_back(fun); + actor->on_exit->emplace_back(fun); } /** @brief Restart a process, starting it again from the beginning. */ @@ -763,12 +603,12 @@ smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix sg_host_t host, std::unordered_map* properties) { smx_actor_t self = SIMIX_process_self(); - return simgrid::simix::simcall([&name, &code, data, host, properties, self] { + return simgrid::kernel::actor::simcall([&name, &code, data, host, properties, self] { return simgrid::kernel::actor::ActorImpl::create(name, 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); }); + simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); }); }