From: Martin Quinson Date: Sun, 6 Jan 2019 14:08:10 +0000 (+0100) Subject: factorize where seq_runall and par_runall save maestro context X-Git-Tag: v3_22~666 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c641d112f8a557b61ff14c261931077773f21fbd?hp=94f511befd8ea7dea78746c1f6ae818a778e67e7 factorize where seq_runall and par_runall save maestro context --- diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 9ae90ca5ae..050267cffd 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -43,12 +43,12 @@ BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cle #else this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper); #endif + } else { + set_maestro(this); // save maestro for run_all() #if BOOST_VERSION < 105600 this->fc_ = new boost::context::fcontext_t(); #endif - if (get_maestro() == nullptr) - set_maestro(this); } } diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 770a35cfe7..8d320a164c 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -206,12 +206,9 @@ RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup #endif this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this); } else { - if (process != nullptr && get_maestro() == nullptr) - set_maestro(this); - if (MC_is_active()) { - XBT_ATTRIB_UNUSED RawContext* maestro = static_cast(get_maestro()); - MC_ignore_heap(&maestro->stack_top_, sizeof(maestro->stack_top_)); - } + set_maestro(this); // save maestro for run_all() + if (MC_is_active()) + MC_ignore_heap(&stack_top_, sizeof(stack_top_)); } } diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 50b96bb288..cb2f31487d 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -40,12 +40,9 @@ thread_local uintptr_t SwappedContext::worker_id_; /* thread-specifi SwappedContextFactory::SwappedContextFactory(std::string name) : ContextFactory(name), parallel_(SIMIX_context_is_parallel()) { - SwappedContext::set_maestro(nullptr); parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel) - if (parallel_) { - workers_context_.clear(); - workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - } + workers_context_.clear(); + workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr); } SwappedContextFactory::~SwappedContextFactory() { @@ -54,8 +51,6 @@ SwappedContextFactory::~SwappedContextFactory() workers_context_.clear(); } -SwappedContext* SwappedContext::maestro_context_ = nullptr; - SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, SwappedContextFactory* factory) : Context(std::move(code), cleanup_func, process), factory_(factory) @@ -174,6 +169,8 @@ void SwappedContextFactory::run_all() } else { // sequential execution if (simix_global->process_to_run.empty()) return; + + /* maestro is already saved in the first slot of workers_context_ */ smx_actor_t first_actor = simix_global->process_to_run.front(); process_index_ = 1; /* execute the first actor; it will chain to the others when using suspend() */ @@ -201,7 +198,6 @@ void SwappedContext::resume() // No body runs that soul anymore at this point, but it is stored in a safe place. // When the executed actor will do a blocking action, SIMIX_process_yield() will call suspend(), below. } else { // sequential execution - // Maestro is always the calling thread of this function (ie, self() == maestro) SwappedContext* old = static_cast(self()); Context::set_current(this); old->swap_into(this); @@ -228,7 +224,7 @@ void SwappedContext::suspend() next_context = static_cast(next_work.get()->context_); } else { // All actors were run, go back to the parmap context - XBT_DEBUG("No more processes to run"); + XBT_DEBUG("No more actors to run"); // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round next_context = factory_->workers_context_[worker_id_]; // When given that soul, the body will wait for the next scheduling round @@ -237,6 +233,7 @@ void SwappedContext::suspend() // Get the next soul to run, either from another actor or the initial minion's one Context::set_current(next_context); this->swap_into(next_context); + } else { // sequential execution /* determine the next context */ SwappedContext* next_context; @@ -245,12 +242,12 @@ void SwappedContext::suspend() if (i < simix_global->process_to_run.size()) { /* Actually swap into the next actor directly without transiting to maestro */ - XBT_DEBUG("Run next process"); + XBT_DEBUG("Run next actor"); next_context = static_cast(simix_global->process_to_run[i]->context_); } else { /* all processes were run, actually return to maestro */ - XBT_DEBUG("No more process to run"); - next_context = static_cast(get_maestro()); + XBT_DEBUG("No more actors to run"); + next_context = factory_->workers_context_[0]; } Context::set_current(next_context); this->swap_into(next_context); diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp index 6e56bb166f..77fb48af40 100644 --- a/src/kernel/context/ContextSwapped.hpp +++ b/src/kernel/context/ContextSwapped.hpp @@ -45,8 +45,7 @@ public: virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses - static SwappedContext* get_maestro() { return maestro_context_; } - static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; } + void set_maestro(SwappedContext* ctx) { factory_->workers_context_[0] = ctx; } // FIXME: Killme static thread_local uintptr_t worker_id_; @@ -55,7 +54,6 @@ protected: void* stack_ = nullptr; /* the thread stack */ private: - static SwappedContext* maestro_context_; SwappedContextFactory* factory_; // for sequential and parallel run_all() }; diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index de85d2ff1a..8bb32024cb 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -55,8 +55,7 @@ UContext::UContext(std::function code, void_pfn_smxprocess_t cleanup_fun #endif UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this); } else { - if (process != nullptr && get_maestro() == nullptr) - set_maestro(this); + set_maestro(this); // save maestro for run_all() } #if SIMGRID_HAVE_MC