-/* 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. */
#include <typeinfo>
#include <utility>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side");
/**
* @brief Returns the current agent.
{
pid_ = maxpid++;
simcall_.issuer_ = this;
- stacksize_ = smx_context_stack_size;
+ stacksize_ = context::stack_size;
}
ActorImpl::~ActorImpl()
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();
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
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;
const auto& actors_to_run = engine->get_actors_to_run();
- xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) ||
+ xbt_assert(not XBT_LOG_ISENABLED(ker_actor, xbt_log_priority_debug) ||
std::find(begin(actors_to_run), end(actors_to_run), this) == end(actors_to_run),
"Actor %p should not exist in actors_to_run!", this);
engine->add_actor_to_run_list_no_check(this);
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);
/* needs to be public and without simcall because it is called by exceptions and logging events */
const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333
{
- return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname();
+ 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_DEPRECATD_v331
+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()
+int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333
{
const auto* self = simgrid::kernel::actor::ActorImpl::self();
- return self == nullptr || simgrid::kernel::EngineImpl::get_instance()->is_maestro(self);
+ return self != nullptr && self->is_maestro();
}