-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2022. 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. */
context->attach_stop();
}
+/** Whether this actor is actually maestro */
+bool ActorImpl::is_maestro() const
+{
+ return context_->is_maestro();
+}
+
void ActorImpl::cleanup_from_simix()
{
auto* engine = EngineImpl::get_instance();
/* destroy the blocking synchro if any */
if (waiting_synchro_ != nullptr) {
waiting_synchro_->cancel();
- waiting_synchro_->state_ = activity::State::FAILED;
+ waiting_synchro_->set_state(activity::State::FAILED);
activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro_);
activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro_);
void ActorImpl::kill(ActorImpl* actor) const
{
- auto* engine = EngineImpl::get_instance();
- xbt_assert(not engine->is_maestro(actor), "Killing maestro is a rather bad idea");
+ xbt_assert(not actor->is_maestro(), "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());
if (actor == this) {
XBT_DEBUG("Go on, this is a suicide,");
} else
- engine->add_actor_to_run_list(actor);
+ EngineImpl::get_instance()->add_actor_to_run_list(actor);
}
void ActorImpl::kill_all() const
/* Go into sleep and return control to maestro */
context_->suspend();
-
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", get_cname());
e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode.");
}
}
-
#if HAVE_SMPI
if (not finished_)
smpi_switch_data_segment(get_iface());
s4u::Actor* ActorImpl::restart()
{
- xbt_assert(not EngineImpl::get_instance()->is_maestro(this), "Restarting maestro is not supported");
+ xbt_assert(not this->is_maestro(), "Restarting maestro is not supported");
XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
void ActorImpl::simcall_answer()
{
auto* engine = EngineImpl::get_instance();
- if (not engine->is_maestro(this)) {
+ if (not this->is_maestro()) {
XBT_DEBUG("Answer simcall %s issued by %s (%p)", SIMIX_simcall_name(simcall_), get_cname(), this);
xbt_assert(simcall_.call_ != simix::Simcall::NONE);
simcall_.call_ = simix::Simcall::NONE;
else
actor = self()->init(xbt::string(name), host);
- /* actor data */
- actor->piface_.set_data(data);
+ actor->piface_.set_data(data); /* actor data */
actor->start(code);
return simgrid::s4u::Actor::is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname();
}
-/** @brief Returns the process from PID. */
-smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATED_v331
-{
- return simgrid::kernel::actor::ActorImpl::by_pid(pid);
-}
-
int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333
{
- return simgrid::s4u::Actor::is_maestro();
+ const auto* self = simgrid::kernel::actor::ActorImpl::self();
+ return self != nullptr && self->is_maestro();
}