X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29285db0f121be2106614c090602073990900b12..4e7df12e1e81b2ff9212175628873d6d880b6630:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index c42d015b59..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 * @@ -95,7 +98,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h 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; @@ -168,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); @@ -180,7 +183,7 @@ 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; } @@ -190,10 +193,6 @@ void ActorImpl::exit() 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(); @@ -216,10 +215,14 @@ void ActorImpl::exit() 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()); @@ -284,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) { @@ -344,27 +347,24 @@ s4u::Actor* ActorImpl::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 { - activity::ExecImpl* exec = new activity::ExecImpl(); - (*exec).set_name("suspend").set_host(host_).set_flops_amount(0.0).start(); - return activity::ExecImplPtr(exec); + waiting_synchro->simcalls_.push_back(&simcall); } + waiting_synchro->suspend(); } void ActorImpl::resume() @@ -403,8 +403,8 @@ 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."))); - activity::SleepImpl* sleep = new activity::SleepImpl(); - (*sleep).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); } @@ -428,11 +428,25 @@ void ActorImpl::throw_exception(std::exception_ptr e) } } +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); + } +} + 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) @@ -464,7 +478,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) 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 */ @@ -508,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; } @@ -516,53 +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) -{ - xbt_ex e(XBT_THROW_POINT, msg); - e.category = cat; - e.value = value; - actor->throw_exception(std::make_exception_ptr(e)); -} - -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(); @@ -572,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); } @@ -581,38 +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; + return SIMIX_is_maestro() ? "maestro" : SIMIX_process_self()->get_cname(); } /** @@ -623,32 +565,17 @@ void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) * @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) @@ -676,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); }); }