From: Arnaud Giersch Date: Sun, 22 Oct 2017 13:38:38 +0000 (+0200) Subject: ContextRaw: reorganize. X-Git-Tag: v3.18~399^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd8aca53cb83f6e71dce032017a841129e2a7209 ContextRaw: reorganize. --- diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 88082ab68c..c9b66a3d23 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -6,26 +6,10 @@ #include "ContextRaw.hpp" #include "mc/mc.h" -#include "src/internal_config.h" -#include "xbt/parmap.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -// ***** Loads of static stuff - -#if HAVE_THREAD_CONTEXTS -static simgrid::xbt::Parmap* raw_parmap; -static simgrid::kernel::context::RawContext** raw_workers_context; /* space to save the worker context in each thread */ -static uintptr_t raw_threads_working; /* number of threads that have started their work */ -static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */ -#endif -static unsigned long raw_process_index = 0; /* index of the next process to run in the - * list of runnable processes */ -static simgrid::kernel::context::RawContext* raw_maestro_context; - -static bool raw_context_parallel = false; - -// ***** Raw context routines +// Raw context routines typedef void (*rawctx_entry_point_t)(void *); @@ -198,66 +182,65 @@ namespace simgrid { namespace kernel { namespace context { -RawContextFactory::RawContextFactory() - : ContextFactory("RawContextFactory") +// RawContextFactory + +RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel()) { - raw_context_parallel = SIMIX_context_is_parallel(); - if (raw_context_parallel) { + RawContext::setMaestro(nullptr); + if (parallel_) { #if HAVE_THREAD_CONTEXTS - int nthreads = SIMIX_context_get_nthreads(); - xbt_os_thread_key_create(&raw_worker_id_key); - // TODO, lazily init - raw_parmap = nullptr; - raw_workers_context = new RawContext*[nthreads]; - raw_maestro_context = nullptr; -#endif // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1 + ParallelRawContext::initialize(); +#else + xbt_die("You asked for a parallel execution, but you don't have any threads."); +#endif } } RawContextFactory::~RawContextFactory() { #if HAVE_THREAD_CONTEXTS - delete raw_parmap; - delete[] raw_workers_context; + if (parallel_) + ParallelRawContext::finalize(); #endif } -RawContext* RawContextFactory::create_context(std::function code, - void_pfn_smxprocess_t cleanup, smx_actor_t process) +Context* RawContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup_func, + smx_actor_t process) { - return this->new_context(std::move(code), cleanup, process); +#if HAVE_THREAD_CONTEXTS + if (parallel_) + return this->new_context(std::move(code), cleanup_func, process); +#endif + + return this->new_context(std::move(code), cleanup_func, process); } -void RawContext::wrapper(void* arg) +void RawContextFactory::run_all() { - RawContext* context = static_cast(arg); - try { - (*context)(); - context->Context::stop(); - } catch (StopRequest const&) { - XBT_DEBUG("Caught a StopRequest"); - } - context->suspend(); +#if HAVE_THREAD_CONTEXTS + if (parallel_) + ParallelRawContext::run_all(); + else +#endif + SerialRawContext::run_all(); } -RawContext::RawContext(std::function code, - void_pfn_smxprocess_t cleanup, smx_actor_t process) - : Context(std::move(code), cleanup, process) +// RawContext + +RawContext* RawContext::maestro_context_ = nullptr; + +RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) + : Context(std::move(code), cleanup, process) { if (has_code()) { this->stack_ = SIMIX_context_stack_new(); - this->stack_top_ = raw_makecontext(this->stack_, - smx_context_usable_stack_size, - RawContext::wrapper, - this); + this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this); } else { - if(process != nullptr && raw_maestro_context == nullptr) - raw_maestro_context = this; + if (process != nullptr && maestro_context_ == nullptr) + maestro_context_ = this; if (MC_is_active()) - MC_ignore_heap( - &raw_maestro_context->stack_top_, - sizeof(raw_maestro_context->stack_top_)); + MC_ignore_heap(&maestro_context_->stack_top_, sizeof(maestro_context_->stack_top_)); } } @@ -266,127 +249,139 @@ RawContext::~RawContext() SIMIX_context_stack_delete(this->stack_); } -void RawContext::stop() +void RawContext::wrapper(void* arg) { - Context::stop(); - throw StopRequest(); + RawContext* context = static_cast(arg); + try { + (*context)(); + context->Context::stop(); + } catch (StopRequest const&) { + XBT_DEBUG("Caught a StopRequest"); + } + context->suspend(); } -void RawContextFactory::run_all() +inline void RawContext::swap(RawContext* from, RawContext* to) { - if (raw_context_parallel) - run_all_parallel(); - else - run_all_serial(); + raw_swapcontext(&from->stack_top_, to->stack_top_); } -void RawContextFactory::run_all_serial() +void RawContext::stop() { - if (simix_global->process_to_run.empty()) - return; - - smx_actor_t first_process = simix_global->process_to_run.front(); - raw_process_index = 1; - static_cast(first_process->context)->resume_serial(); + Context::stop(); + throw StopRequest(); } -void RawContextFactory::run_all_parallel() -{ -#if HAVE_THREAD_CONTEXTS - raw_threads_working = 0; - if (raw_parmap == nullptr) - raw_parmap = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); - raw_parmap->apply( - [](smx_actor_t process) { - RawContext* context = static_cast(process->context); - context->resume_parallel(); - }, - simix_global->process_to_run); -#else - xbt_die("You asked for a parallel execution, but you don't have any threads."); -#endif -} +// SerialRawContext -void RawContext::suspend() -{ - if (raw_context_parallel) - RawContext::suspend_parallel(); - else - RawContext::suspend_serial(); -} +unsigned long SerialRawContext::process_index_; /* index of the next process to run in the list of runnable processes */ -void RawContext::suspend_serial() +void SerialRawContext::suspend() { /* determine the next context */ - RawContext* next_context = nullptr; - unsigned long int i = raw_process_index; - raw_process_index++; + SerialRawContext* next_context; + unsigned long int i = process_index_; + process_index_++; if (i < simix_global->process_to_run.size()) { /* execute the next process */ XBT_DEBUG("Run next process"); - next_context = static_cast(simix_global->process_to_run[i]->context); + next_context = static_cast(simix_global->process_to_run[i]->context); } else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - next_context = static_cast(raw_maestro_context); + next_context = static_cast(RawContext::getMaestro()); } SIMIX_context_set_current(next_context); - raw_swapcontext(&this->stack_top_, next_context->stack_top_); + RawContext::swap(this, next_context); +} + +void SerialRawContext::resume() +{ + SIMIX_context_set_current(this); + RawContext::swap(RawContext::getMaestro(), this); } -void RawContext::suspend_parallel() +void SerialRawContext::run_all() { + if (simix_global->process_to_run.empty()) + return; + smx_actor_t first_process = simix_global->process_to_run.front(); + process_index_ = 1; + static_cast(first_process->context)->resume(); +} + +// ParallelRawContext + #if HAVE_THREAD_CONTEXTS + +simgrid::xbt::Parmap* ParallelRawContext::parmap_; +uintptr_t ParallelRawContext::threads_working_; /* number of threads that have started their work */ +xbt_os_thread_key_t ParallelRawContext::worker_id_key_; /* thread-specific storage for the thread id */ +std::vector ParallelRawContext::workers_context_; /* space to save the worker context + in each thread */ + +void ParallelRawContext::initialize() +{ + parmap_ = nullptr; + workers_context_.clear(); + workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); + xbt_os_thread_key_create(&worker_id_key_); +} + +void ParallelRawContext::finalize() +{ + delete parmap_; + parmap_ = nullptr; + workers_context_.clear(); + xbt_os_thread_key_destroy(worker_id_key_); +} + +void ParallelRawContext::run_all() +{ + threads_working_ = 0; + if (parmap_ == nullptr) + parmap_ = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); + parmap_->apply( + [](smx_actor_t process) { + ParallelRawContext* context = static_cast(process->context); + context->resume(); + }, + simix_global->process_to_run); +} + +void ParallelRawContext::suspend() +{ /* determine the next context */ - boost::optional next_work = raw_parmap->next(); - RawContext* next_context; + boost::optional next_work = parmap_->next(); + ParallelRawContext* next_context; if (next_work) { /* there is a next process to resume */ XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context); + next_context = static_cast(next_work.get()->context); } else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); - uintptr_t worker_id = (uintptr_t) - xbt_os_thread_get_specific(raw_worker_id_key); - next_context = raw_workers_context[worker_id]; - XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", - worker_id, raw_threads_working); + uintptr_t worker_id = reinterpret_cast(xbt_os_thread_get_specific(worker_id_key_)); + next_context = workers_context_[worker_id]; + XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, threads_working_); } SIMIX_context_set_current(next_context); - raw_swapcontext(&this->stack_top_, next_context->stack_top_); -#endif -} - -void RawContext::resume() -{ - if (raw_context_parallel) - resume_parallel(); - else - resume_serial(); + RawContext::swap(this, next_context); } -void RawContext::resume_serial() +void ParallelRawContext::resume() { + uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1); + xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); + ParallelRawContext* worker_context = static_cast(SIMIX_context_self()); + workers_context_[worker_id] = worker_context; + XBT_DEBUG("Saving worker stack %zu", worker_id); SIMIX_context_set_current(this); - raw_swapcontext(&raw_maestro_context->stack_top_, this->stack_top_); + RawContext::swap(worker_context, this); } -void RawContext::resume_parallel() -{ -#if HAVE_THREAD_CONTEXTS - uintptr_t worker_id = __sync_fetch_and_add(&raw_threads_working, 1); - xbt_os_thread_set_specific(raw_worker_id_key, (void*) worker_id); - RawContext* worker_context = static_cast(SIMIX_context_self()); - raw_workers_context[worker_id] = worker_context; - XBT_DEBUG("Saving worker stack %zu", worker_id); - SIMIX_context_set_current(this); - raw_swapcontext(&worker_context->stack_top_, this->stack_top_); -#else - xbt_die("Parallel execution disabled"); #endif -} ContextFactory* raw_factory() { diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp index 82ff4462ec..b4f30ec56c 100644 --- a/src/kernel/context/ContextRaw.hpp +++ b/src/kernel/context/ContextRaw.hpp @@ -6,7 +6,13 @@ #ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP #define SIMGRID_SIMIX_BOOST_CONTEXT_HPP +#include #include +#include + +#include +#include +#include #include "Context.hpp" #include "src/internal_config.h" @@ -16,47 +22,77 @@ namespace simgrid { namespace kernel { namespace context { -class RawContext; -class RawContextFactory; - /** @brief Fast context switching inspired from SystemV ucontexts. * * The main difference to the System V context is that Raw Contexts are much faster because they don't * preserve the signal mask when switching. This saves a system call (at least on Linux) on each context switch. */ class RawContext : public Context { +public: + RawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process); + ~RawContext() override; + void stop() override; + virtual void resume() = 0; + + static void swap(RawContext* from, RawContext* to); + static RawContext* getMaestro() { return maestro_context_; } + static void setMaestro(RawContext* maestro) { maestro_context_ = maestro; } + private: + static RawContext* maestro_context_; void* stack_ = nullptr; /** pointer to top the stack stack */ void* stack_top_ = nullptr; + static void wrapper(void* arg); +}; + +class SerialRawContext : public RawContext { public: - friend class RawContextFactory; - RawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process); - ~RawContext() override; + SerialRawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) + : RawContext(std::move(code), cleanup_func, process) + { + } + void suspend() override; + void resume() override; - static void wrapper(void* arg); - void stop() override; + static void run_all(); + +private: + static unsigned long process_index_; +}; + +#if HAVE_THREAD_CONTEXTS +class ParallelRawContext : public RawContext { +public: + ParallelRawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) + : RawContext(std::move(code), cleanup_func, process) + { + } void suspend() override; - void resume(); + void resume() override; + + static void initialize(); + static void finalize(); + static void run_all(); private: - void suspend_serial(); - void suspend_parallel(); - void resume_serial(); - void resume_parallel(); + static simgrid::xbt::Parmap* parmap_; + static std::vector workers_context_; + static uintptr_t threads_working_; + static xbt_os_thread_key_t worker_id_key_; }; +#endif class RawContextFactory : public ContextFactory { public: RawContextFactory(); ~RawContextFactory() override; - RawContext* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override; + Context* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override; void run_all() override; private: - void run_all_serial(); - void run_all_parallel(); + bool parallel_; }; }}} // namespace