X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be9dfa7f1f4859668e631469d16e174e1423f0f0..5d39e0c5387d4eb55620329717bfdf6c37aa0d91:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index c42198bdce..935fa6d54a 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -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,21 +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_) - s4u::Actor::on_destruction(*ciface()); + s4u::Actor::on_destruction(*get_ciface()); } /* Become an actor in the simulation @@ -84,7 +85,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } - ActorImpl* actor = new ActorImpl(xbt::string(name), host); + auto* actor = new ActorImpl(xbt::string(name), host); /* Actor data */ actor->set_user_data(data); actor->code_ = nullptr; @@ -111,7 +112,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h context->attach_start(); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - s4u::Actor::on_creation(*actor->ciface()); + s4u::Actor::on_creation(*actor->get_ciface()); return ActorImplPtr(actor); } @@ -165,26 +166,31 @@ 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; } + if (simcall_.timeout_cb_) { + simcall_.timeout_cb_->remove(); + simcall_.timeout_cb_ = nullptr; + } + cleanup_from_simix(); 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()); }); + actor::simcall([this] { s4u::Actor::on_termination(*get_ciface()); }); context_->set_wannadie(); } @@ -195,33 +201,33 @@ void ActorImpl::exit() 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_) { @@ -246,7 +252,7 @@ void ActorImpl::kill(ActorImpl* actor) } } -void ActorImpl::kill_all() +void ActorImpl::kill_all() const { for (auto const& kv : simix_global->process_list) if (kv.second != this) @@ -258,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() @@ -289,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) { @@ -301,7 +310,7 @@ void ActorImpl::yield() } if (SMPI_switch_data_segment && not finished_) { - SMPI_switch_data_segment(iface()); + SMPI_switch_data_segment(get_iface()); } } @@ -347,7 +356,7 @@ s4u::Actor* ActorImpl::restart() actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); - return actor->ciface(); + return actor->get_ciface(); } void ActorImpl::suspend() @@ -359,15 +368,10 @@ 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() @@ -383,9 +387,11 @@ 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(); } @@ -419,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), @@ -452,14 +454,14 @@ 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); + auto* actor = new ActorImpl(xbt::string(name), host); actor->set_ppid(this->pid_); intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - s4u::Actor::on_creation(*actor->ciface()); + s4u::Actor::on_creation(*actor->get_ciface()); return ActorImplPtr(actor); } @@ -492,7 +494,8 @@ ActorImpl* ActorImpl::start(const ActorCode& code) } ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host, - const std::unordered_map* properties, ActorImpl* parent_actor) + const std::unordered_map* properties, + const ActorImpl* parent_actor) { XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); @@ -517,7 +520,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v void create_maestro(const std::function& code) { /* Create maestro actor and initialize it */ - ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); + auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); if (not code) { maestro->context_.reset(simix_global->context_factory->create_context(ActorCode(), maestro)); @@ -525,7 +528,7 @@ void create_maestro(const std::function& code) maestro->context_.reset(simix_global->context_factory->create_maestro(ActorCode(code), maestro)); } - maestro->simcall.issuer_ = maestro; + maestro->simcall_.issuer_ = maestro; simix_global->maestro_ = maestro; } @@ -538,8 +541,7 @@ int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329 return simix_global->process_list.size(); } -// XBT_DEPRECATED_v329 -void* SIMIX_process_self_get_data() +void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329 { smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); @@ -549,8 +551,7 @@ void* SIMIX_process_self_get_data() return self->get_user_data(); } -// XBT_DEPRECATED_v329 -void SIMIX_process_self_set_data(void* data) +void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329 { simgrid::kernel::actor::ActorImpl::self()->set_user_data(data); }