X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/285721a10666864ff257d2709094ece7dcccc879..94ba3e61c1cf68520a2ddc8706aad9da7f54f37e:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 46103930c6..87b490ea80 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -1,24 +1,11 @@ -/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2018. 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 "ContextBoost.hpp" - -#include -#include - -#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT -#include -#define ASAN_EVAL(expr) (expr) -#define ASAN_START_SWITCH(fake_stack_save, bottom, size) __sanitizer_start_switch_fiber(fake_stack_save, bottom, size) -#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) \ - __sanitizer_finish_switch_fiber(fake_stack_save, bottom_old, size_old) -#else -#define ASAN_EVAL(expr) (void)0 -#define ASAN_START_SWITCH(fake_stack_save, bottom, size) (void)0 -#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) (void)(fake_stack_save) -#endif +#include "context_private.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -31,13 +18,10 @@ namespace context { BoostContextFactory::BoostContextFactory() : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel()) { + BoostContext::setMaestro(nullptr); if (parallel_) { #if HAVE_THREAD_CONTEXTS - BoostContext::parmap_ = nullptr; - BoostContext::workers_context_.clear(); - BoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - BoostContext::maestro_context_ = nullptr; - xbt_os_thread_key_create(&BoostContext::worker_id_key_); + ParallelBoostContext::initialize(); #else xbt_die("No thread support for parallel context execution"); #endif @@ -47,9 +31,8 @@ BoostContextFactory::BoostContextFactory() BoostContextFactory::~BoostContextFactory() { #if HAVE_THREAD_CONTEXTS - delete BoostContext::parmap_; - BoostContext::parmap_ = nullptr; - BoostContext::workers_context_.clear(); + if (parallel_) + ParallelBoostContext::finalize(); #endif } @@ -67,38 +50,16 @@ smx_context_t BoostContextFactory::create_context(std::function code, vo void BoostContextFactory::run_all() { #if HAVE_THREAD_CONTEXTS - if (parallel_) { - BoostContext::threads_working_ = 0; - if (not BoostContext::parmap_) - BoostContext::parmap_ = - new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); - BoostContext::parmap_->apply( - [](smx_actor_t process) { - BoostContext* context = static_cast(process->context); - return context->resume(); - }, - simix_global->process_to_run); - return; - } + if (parallel_) + ParallelBoostContext::run_all(); + else #endif - - if (simix_global->process_to_run.empty()) - return; - smx_actor_t first_process = simix_global->process_to_run.front(); - BoostContext::process_index_ = 1; - /* execute the first process */ - static_cast(first_process->context)->resume(); + SerialBoostContext::run_all(); } - // BoostContext -simgrid::xbt::Parmap* BoostContext::parmap_ = nullptr; -uintptr_t BoostContext::threads_working_ = 0; -xbt_os_thread_key_t BoostContext::worker_id_key_; -unsigned long BoostContext::process_index_ = 0; BoostContext* BoostContext::maestro_context_ = nullptr; -std::vector BoostContext::workers_context_; BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) : Context(std::move(code), cleanup_func, process) @@ -168,7 +129,7 @@ inline void BoostContext::swap(BoostContext* from, BoostContext* to) boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast(to)); #else BoostContext* ctx[2] = {from, to}; - void* fake_stack; + void* fake_stack = nullptr; ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx); ASAN_FINISH_SWITCH(fake_stack, &static_cast(arg.data)[0]->asan_stack_, @@ -185,6 +146,8 @@ void BoostContext::stop() // SerialBoostContext +unsigned long SerialBoostContext::process_index_; + void SerialBoostContext::suspend() { /* determine the next context */ @@ -199,22 +162,66 @@ void SerialBoostContext::suspend() } else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - next_context = static_cast(maestro_context_); + next_context = static_cast(BoostContext::getMaestro()); } - SIMIX_context_set_current(static_cast(next_context)); + SIMIX_context_set_current(next_context); BoostContext::swap(this, next_context); } void SerialBoostContext::resume() { SIMIX_context_set_current(this); - BoostContext::swap(maestro_context_, this); + BoostContext::swap(BoostContext::getMaestro(), this); +} + +void SerialBoostContext::run_all() +{ + if (simix_global->process_to_run.empty()) + return; + smx_actor_t first_process = simix_global->process_to_run.front(); + process_index_ = 1; + /* execute the first process */ + static_cast(first_process->context)->resume(); } // ParallelBoostContext #if HAVE_THREAD_CONTEXTS +simgrid::xbt::Parmap* ParallelBoostContext::parmap_; +std::atomic ParallelBoostContext::threads_working_; +xbt_os_thread_key_t ParallelBoostContext::worker_id_key_; +std::vector ParallelBoostContext::workers_context_; + +void ParallelBoostContext::initialize() +{ + parmap_ = nullptr; + workers_context_.clear(); + workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); + xbt_os_thread_key_create(&worker_id_key_); +} + +void ParallelBoostContext::finalize() +{ + delete parmap_; + parmap_ = nullptr; + workers_context_.clear(); + xbt_os_thread_key_destroy(worker_id_key_); +} + +void ParallelBoostContext::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) { + ParallelBoostContext* context = static_cast(process->context); + context->resume(); + }, + simix_global->process_to_run); +} + void ParallelBoostContext::suspend() { boost::optional next_work = parmap_->next(); @@ -225,20 +232,20 @@ void ParallelBoostContext::suspend() } else { XBT_DEBUG("No more processes to run"); uintptr_t worker_id = reinterpret_cast(xbt_os_thread_get_specific(worker_id_key_)); - next_context = static_cast(workers_context_[worker_id]); + next_context = workers_context_[worker_id]; } - SIMIX_context_set_current(static_cast(next_context)); + SIMIX_context_set_current(next_context); BoostContext::swap(this, next_context); } void ParallelBoostContext::resume() { - uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1); + uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed); xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); ParallelBoostContext* worker_context = static_cast(SIMIX_context_self()); - workers_context_[worker_id] = worker_context; + workers_context_[worker_id] = worker_context; SIMIX_context_set_current(this); BoostContext::swap(worker_context, this);