X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96143e570f085e4217506ca72245a522fd5c24e1..b9625f82f86db0674e911887addce45dca31b57f:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 1e5e15e512..0c9d9a5d6a 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -13,7 +13,7 @@ #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.hpp" -#include "src/mc/remote/Client.hpp" +#include "src/mc/remote/AppSide.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" @@ -47,26 +47,22 @@ int get_maxpid() ActorImpl* ActorImpl::self() { - context::Context* self_context = context::Context::self(); + const context::Context* self_context = context::Context::self(); return (self_context != nullptr) ? self_context->get_actor() : nullptr; } ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this) { - pid_ = maxpid++; - simcall.issuer_ = this; + pid_ = maxpid++; + simcall_.issuer_ = this; + stacksize_ = smx_context_stack_size; } ActorImpl::~ActorImpl() { - if (simix_global != nullptr && this != simix_global->maestro_) { - 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 - actor::simcall([this] { s4u::Actor::on_destruction(*ciface()); }); - if (context_.get() != nullptr) - context_->iwannadie = true; - } + if (simix_global != nullptr && this != simix_global->maestro_) + s4u::Actor::on_destruction(*ciface()); } /* Become an actor in the simulation @@ -82,10 +78,10 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h { // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions. - XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname()); + XBT_DEBUG("Attach actor %s on host '%s'", name.c_str(), host->get_cname()); if (not host->is_on()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname()); + XBT_WARN("Cannot attach actor '%s' on failed host '%s'", name.c_str(), host->get_cname()); throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } @@ -102,10 +98,10 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h if (properties != nullptr) actor->set_properties(*properties); - /* Add the process to it's host process list */ + /* Add the actor to it's host actor list */ host->pimpl_->add_actor(actor); - /* Now insert it in the global process list and in the process to run list */ + /* Now insert it in the global actor list and in the actors 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); @@ -136,6 +132,20 @@ void ActorImpl::detach() context->attach_stop(); } +void ActorImpl::cleanup_from_simix() +{ + const std::lock_guard lock(simix_global->mutex); + simix_global->process_list.erase(pid_); + 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); +#endif + simix_global->actors_to_destroy.push_back(*this); + } +} + void ActorImpl::cleanup() { finished_ = true; @@ -148,7 +158,7 @@ void ActorImpl::cleanup() if (on_exit) { // Execute the termination callbacks - bool failed = context_->iwannadie; + bool failed = context_->wannadie(); for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun) (*exit_fun)(failed); on_exit.reset(); @@ -156,76 +166,68 @@ void ActorImpl::cleanup() undaemonize(); /* cancel non-blocking activities */ - for (auto activity : comms) - boost::static_pointer_cast(activity)->cancel(); - comms.clear(); + for (auto activity : activities_) + activity->cancel(); + activities_.clear(); XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid()); if (this == simix_global->maestro_) /* Do not cleanup maestro */ return; - XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get()); + XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro_.get()); - /* Unregister from the kill timer if any */ - if (kill_timer != nullptr) { - kill_timer->remove(); - kill_timer = nullptr; + /* Unregister associated timers if any */ + if (kill_timer_ != nullptr) { + kill_timer_->remove(); + kill_timer_ = nullptr; } - - simix_global->mutex.lock(); - - simix_global->process_list.erase(pid_); - 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); -#endif - simix_global->actors_to_destroy.push_back(*this); + if (simcall_.timeout_cb_) { + simcall_.timeout_cb_->remove(); + simcall_.timeout_cb_ = nullptr; } - simix_global->mutex.unlock(); + cleanup_from_simix(); - context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops + context_->set_wannadie(false); // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops actor::simcall([this] { s4u::Actor::on_termination(*ciface()); }); - context_->iwannadie = true; + context_->set_wannadie(); } void ActorImpl::exit() { - context_->iwannadie = true; + context_->set_wannadie(); suspended_ = false; exception_ = nullptr; /* destroy the blocking synchro if any */ - if (waiting_synchro != nullptr) { - waiting_synchro->cancel(); - waiting_synchro->state_ = activity::State::FAILED; + if (waiting_synchro_ != nullptr) { + waiting_synchro_->cancel(); + waiting_synchro_->state_ = activity::State::FAILED; - activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro); - activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); + activity::ExecImplPtr exec = boost::dynamic_pointer_cast(waiting_synchro_); + activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro_); if (exec != nullptr) { exec->clean_action(); } else if (comm != nullptr) { - comms.remove(waiting_synchro); // 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); + auto i = boost::range::find(waiting_synchro_->simcalls_, &simcall_); + if (i != waiting_synchro_->simcalls_.end()) + waiting_synchro_->simcalls_.remove(&simcall_); } else { - activity::ActivityImplPtr(waiting_synchro)->finish(); + activity::ActivityImplPtr(waiting_synchro_)->finish(); } - waiting_synchro = nullptr; + activities_.remove(waiting_synchro_); + 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) +void ActorImpl::kill(ActorImpl* actor) const { xbt_assert(actor != simix_global->maestro_, "Killing maestro is a rather bad idea"); if (actor->finished_) { @@ -239,15 +241,18 @@ void ActorImpl::kill(ActorImpl* actor) 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) { + if (actor == this) { + XBT_DEBUG("Go on, this is a suicide,"); + } else if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) != + end(simix_global->actors_to_run)) { + XBT_DEBUG("Actor %s is already in the to_run list", actor->get_cname()); + } else { XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname()); simix_global->actors_to_run.push_back(actor); } } -void ActorImpl::kill_all() +void ActorImpl::kill_all() const { for (auto const& kv : simix_global->process_list) if (kv.second != this) @@ -259,15 +264,15 @@ void ActorImpl::set_kill_time(double kill_time) if (kill_time <= SIMIX_get_clock()) return; 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] { + kill_timer_ = simix::Timer::set(kill_time, [this] { this->exit(); - kill_timer = nullptr; + kill_timer_ = nullptr; }); } -double ActorImpl::get_kill_time() +double ActorImpl::get_kill_time() const { - return kill_timer ? kill_timer->get_date() : 0; + return kill_timer_ ? kill_timer_->get_date() : 0; } void ActorImpl::yield() @@ -280,7 +285,7 @@ void ActorImpl::yield() /* Ok, maestro returned control to us */ XBT_DEBUG("Control returned to me: '%s'", get_cname()); - if (context_->iwannadie) { + if (context_->wannadie()) { XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname()); context_->stop(); THROW_IMPOSSIBLE; @@ -290,8 +295,11 @@ void ActorImpl::yield() XBT_DEBUG("Hey! I'm suspended."); xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls."); - suspended_ = false; - suspend(); + + if (waiting_synchro_ != nullptr) // Not sure of when this will happen. Maybe when suspending early in the SR when a + waiting_synchro_->suspend(); // waiting_synchro was terminated + + yield(); // Yield back to maestro without proceeding with my execution. I'll get rescheduled by resume() } if (exception_ != nullptr) { @@ -360,22 +368,17 @@ void ActorImpl::suspend() suspended_ = true; - /* 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); - - waiting_synchro->simcalls_.push_back(&simcall); - } - waiting_synchro->suspend(); + /* If the suspended actor is waiting on a sync, suspend its synchronization. + * Otherwise, it will suspend itself when scheduled, ie, very soon. */ + if (waiting_synchro_ != nullptr) + waiting_synchro_->suspend(); } void ActorImpl::resume() { XBT_IN("actor = %p", this); - if (context_->iwannadie) { + if (context_->wannadie()) { XBT_VERB("Ignoring request to suspend an actor that is currently dying."); return; } @@ -384,14 +387,16 @@ void ActorImpl::resume() return; suspended_ = false; - /* resume the synchronization that was blocking the resumed actor. */ - if (waiting_synchro) - waiting_synchro->resume(); + /* resume the activity that was blocking the resumed actor. */ + if (waiting_synchro_) + waiting_synchro_->resume(); + else // Reschedule the actor if it was forcefully unscheduled in yield() + simix_global->actors_to_run.push_back(this); XBT_OUT(); } -activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout) +activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout) { activity::ActivityImplPtr sleep = this->sleep(timeout); actor->on_exit->emplace_back([sleep](bool) { @@ -420,24 +425,20 @@ void ActorImpl::throw_exception(std::exception_ptr e) resume(); /* cancel the blocking synchro if any */ - if (waiting_synchro) { - waiting_synchro->cancel(); - - activity::CommImplPtr comm = boost::dynamic_pointer_cast(waiting_synchro); - - if (comm != nullptr) - comms.remove(comm); - - waiting_synchro = nullptr; + if (waiting_synchro_) { + waiting_synchro_->cancel(); + activities_.remove(waiting_synchro_); + waiting_synchro_ = nullptr; } } void ActorImpl::simcall_answer() { if (this != simix_global->maestro_) { - XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call_), (int)simcall.call_, + 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(simcall_.call_ != SIMCALL_NONE); + 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), @@ -453,7 +454,7 @@ void ActorImpl::set_host(s4u::Host* dest) dest->pimpl_->add_actor(this); } -ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) +ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const { ActorImpl* actor = new ActorImpl(xbt::string(name), host); actor->set_ppid(this->pid_); @@ -465,7 +466,7 @@ ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) return ActorImplPtr(actor); } -ActorImpl* ActorImpl::start(const simix::ActorCode& code) +ActorImpl* ActorImpl::start(const ActorCode& code) { xbt_assert(code && host_ != nullptr, "Invalid parameters"); @@ -477,7 +478,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) this->code_ = code; XBT_VERB("Create context %s", get_cname()); - context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this)); + context_.reset(simix_global->context_factory->create_context(ActorCode(code), this)); XBT_DEBUG("Start context '%s'", get_cname()); @@ -492,8 +493,9 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) return this; } -ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host, - const std::unordered_map* properties, ActorImpl* parent_actor) +ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host, + const std::unordered_map* properties, + const ActorImpl* parent_actor) { XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); @@ -521,12 +523,12 @@ void create_maestro(const std::function& code) ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); if (not code) { - maestro->context_.reset(simix_global->context_factory->create_context(simix::ActorCode(), maestro)); + maestro->context_.reset(simix_global->context_factory->create_context(ActorCode(), maestro)); } else { - maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro)); + maestro->context_.reset(simix_global->context_factory->create_maestro(ActorCode(code), maestro)); } - maestro->simcall.issuer_ = maestro; + maestro->simcall_.issuer_ = maestro; simix_global->maestro_ = maestro; } @@ -606,7 +608,7 @@ void SIMIX_process_on_exit(smx_actor_t actor, * @param host where the new agent is executed. * @param properties the properties of the process */ -smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix::ActorCode& code, void* data, +smx_actor_t simcall_process_create(const std::string& name, const simgrid::kernel::actor::ActorCode& code, void* data, sg_host_t host, std::unordered_map* properties) { smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); @@ -615,7 +617,7 @@ smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix }); } -void simcall_process_set_data(smx_actor_t process, void* data) +void simcall_process_set_data(smx_actor_t process, void* data) // XBT_ATTRIB_DEPRECATED_v329 { simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); }); }