From: Frederic Suter Date: Fri, 29 Nov 2019 10:18:28 +0000 (+0100) Subject: maestro_process -> maestro_ X-Git-Tag: v3.25~348 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d33a14dc048378e654595318c473d0386bc3b514?hp=1a4f00ba0c403c20a7eae8bea566371a4f131b3e maestro_process -> maestro_ --- diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 28fcc0f4ed..89052da6d9 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -60,7 +60,7 @@ ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), ActorImpl::~ActorImpl() { - if (simix_global != nullptr && this != simix_global->maestro_process) { + 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 simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); @@ -162,7 +162,7 @@ void ActorImpl::cleanup() XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid()); - if (this == simix_global->maestro_process) /* Do not cleanup maestro */ + 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()); @@ -227,7 +227,7 @@ void ActorImpl::exit() void ActorImpl::kill(ActorImpl* actor) { - xbt_assert(actor != simix_global->maestro_process, "Killing maestro is a rather bad idea"); + xbt_assert(actor != simix_global->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()); @@ -331,7 +331,7 @@ void ActorImpl::undaemonize() s4u::Actor* ActorImpl::restart() { - xbt_assert(this != simix_global->maestro_process, "Restarting maestro is not supported"); + xbt_assert(this != simix_global->maestro_, "Restarting maestro is not supported"); XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname()); @@ -434,7 +434,7 @@ void ActorImpl::throw_exception(std::exception_ptr e) void ActorImpl::simcall_answer() { - if (this != simix_global->maestro_process){ + if (this != simix_global->maestro_) { 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; @@ -527,7 +527,7 @@ void create_maestro(const std::function& code) } maestro->simcall.issuer_ = maestro; - simix_global->maestro_process = maestro; + simix_global->maestro_ = maestro; } } // namespace actor diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index a9736ccd52..5f1f15975f 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -158,7 +158,7 @@ void ThreadContext::suspend() void ThreadContext::attach_start() { // We're breaking the layers here by depending on the upper layer: - ThreadContext* maestro = static_cast(simix_global->maestro_process->context_.get()); + ThreadContext* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->begin_.release(); xbt_assert(not this->is_maestro()); this->start(); @@ -169,7 +169,7 @@ void ThreadContext::attach_stop() xbt_assert(not this->is_maestro()); this->yield(); - ThreadContext* maestro = static_cast(simix_global->maestro_process->context_.get()); + ThreadContext* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->end_.acquire(); Context::set_current(nullptr); diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index fcb408dace..ba60b6d8c3 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -29,7 +29,7 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) { smx_actor_t self = SIMIX_process_self(); simgrid::simix::marshal(&self->simcall, call, t...); - if (self != simix_global->maestro_process) { + if (self != simix_global->maestro_) { XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call_), (int)self->simcall.call_); self->yield(); diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 01cca20a49..82d9aa5b05 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -384,7 +384,7 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) { smx_actor_t self = SIMIX_process_self(); simgrid::simix::marshal(&self->simcall, call, t...); - if (self != simix_global->maestro_process) { + if (self != simix_global->maestro_) { XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->get_cname(), SIMIX_simcall_name(self->simcall.call_), (int)self->simcall.call_); self->yield(); diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index f4e07505f3..916eecae49 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -250,7 +250,7 @@ void SIMIX_global_init(int *argc, char **argv) surf_init(argc, argv); /* Initialize SURF structures */ simix_global.reset(new simgrid::simix::Global()); - simix_global->maestro_process = nullptr; + simix_global->maestro_ = nullptr; SIMIX_context_mod_init(); // Either create a new context with maestro or create @@ -310,7 +310,7 @@ void SIMIX_clean() #endif /* Kill all processes (but maestro) */ - simix_global->maestro_process->kill_all(); + simix_global->maestro_->kill_all(); simix_global->run_all_actors(); simix_global->empty_trash(); @@ -333,8 +333,8 @@ void SIMIX_clean() #endif /* Let's free maestro now */ - delete simix_global->maestro_process; - simix_global->maestro_process = nullptr; + delete simix_global->maestro_; + simix_global->maestro_ = nullptr; /* Finish context module and SURF */ SIMIX_context_mod_exit(); @@ -485,7 +485,7 @@ void SIMIX_run() if (simix_global->process_list.size() == simix_global->daemons.size()) for (auto const& dmon : simix_global->daemons) { XBT_DEBUG("Kill %s", dmon->get_cname()); - simix_global->maestro_process->kill(dmon); + simix_global->maestro_->kill(dmon); } } @@ -603,5 +603,5 @@ int SIMIX_is_maestro() if (simix_global == nullptr) // SimDag return true; simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self(); - return self == nullptr || self == simix_global->maestro_process; + return self == nullptr || self == simix_global->maestro_; } diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index c1cb4fce30..147a1f6d11 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -52,7 +52,7 @@ public: xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr); xbt_dynar_t dead_actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr); #endif - kernel::actor::ActorImpl* maestro_process = nullptr; + kernel::actor::ActorImpl* maestro_ = nullptr; // Maps function names to actor code: std::unordered_map registered_functions;