X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b7b18bf76328764ba08d088f0b589c2737ffe36..94f511befd8ea7dea78746c1f6ae818a778e67e7:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index a4c78b34e0..9ae90ca5ae 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -1,22 +1,12 @@ -/* 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 - -#include -#include -#include - -#include - -#include -#include - -#include "src/simix/smx_private.h" -#include "src/internal_config.h" -#include "src/kernel/context/ContextBoost.hpp" +#include "ContextBoost.hpp" +#include "context_private.hpp" +#include "simgrid/Exception.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -24,165 +14,41 @@ namespace simgrid { namespace kernel { namespace context { -class BoostSerialContext : public BoostContext { -public: - BoostSerialContext(std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_actor_t process) - : BoostContext(std::move(code), cleanup_func, process) {} - void stop() override; - void suspend() override; -}; - -#if HAVE_THREAD_CONTEXTS -class BoostParallelContext : public BoostContext { -public: - BoostParallelContext(std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_actor_t process) - : BoostContext(std::move(code), cleanup_func, process) {} - void stop() override; - void suspend() override; - void resume() override; -}; -#endif - // BoostContextFactory - -bool BoostContext::parallel_ = false; -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_; - -BoostContextFactory::BoostContextFactory() - : ContextFactory("BoostContextFactory") -{ - BoostContext::parallel_ = SIMIX_context_is_parallel(); - if (BoostContext::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_); -#else - xbt_die("No thread support for parallel context execution"); -#endif - } -} - -BoostContextFactory::~BoostContextFactory() -{ -#if HAVE_THREAD_CONTEXTS - delete BoostContext::parmap_; - BoostContext::parmap_ = nullptr; - BoostContext::workers_context_.clear(); -#endif -} - smx_context_t BoostContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) { - BoostContext* context = nullptr; - if (BoostContext::parallel_) -#if HAVE_THREAD_CONTEXTS - context = this->new_context(std::move(code), cleanup_func, process); -#else - xbt_die("No support for parallel execution"); -#endif - else - context = this->new_context(std::move(code), cleanup_func, process); - return context; -} - -void BoostContextFactory::run_all() -{ -#if HAVE_THREAD_CONTEXTS - if (BoostContext::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); - } 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(); - } + return this->new_context(std::move(code), cleanup_func, process, this); } - // BoostContext -void BoostContext::smx_ctx_boost_wrapper(BoostContext::ctx_arg_type arg) -{ -#if BOOST_VERSION < 106100 - BoostContext* context = reinterpret_cast(arg); -#else - static_cast(arg.data)[0]->fc_ = arg.fctx; - BoostContext* context = static_cast(arg.data)[1]; -#endif - try { - (*context)(); - context->stop(); - } catch (StopRequest) { - XBT_DEBUG("Caught a StopRequest"); - } - context->suspend(); -} - -inline void BoostContext::smx_ctx_boost_jump_fcontext(BoostContext* from, BoostContext* to) -{ -#if BOOST_VERSION < 105600 - boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast(to)); -#elif BOOST_VERSION < 106100 - boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast(to)); -#else - BoostContext* ctx[2] = {from, to}; - boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx); - static_cast(arg.data)[0]->fc_ = arg.fctx; -#endif -} - -BoostContext::BoostContext(std::function code, - void_pfn_smxprocess_t cleanup_func, smx_actor_t process) - : Context(std::move(code), cleanup_func, process) +BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, + SwappedContextFactory* factory) + : SwappedContext(std::move(code), cleanup_func, process, factory) { /* if the user provided a function for the process then use it, otherwise it is the context for maestro */ if (has_code()) { - this->stack_ = SIMIX_context_stack_new(); -// We need to pass the bottom of the stack to make_fcontext, depending on the stack direction it may be the lower -// or higher address: + /* We need to pass the bottom of the stack to make_fcontext, + depending on the stack direction it may be the lower or higher address: */ #if PTH_STACKGROWTH == -1 - void* stack = static_cast(this->stack_) + smx_context_usable_stack_size - 1; + void* stack = static_cast(this->stack_) + smx_context_usable_stack_size; #else void* stack = this->stack_; #endif + ASAN_ONLY(this->asan_stack_ = stack); #if BOOST_VERSION < 106100 - this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, smx_ctx_boost_wrapper); + this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper); #else - this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, smx_ctx_boost_wrapper); + this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper); #endif } else { #if BOOST_VERSION < 105600 this->fc_ = new boost::context::fcontext_t(); #endif - if (BoostContext::maestro_context_ == nullptr) - BoostContext::maestro_context_ = this; + if (get_maestro() == nullptr) + set_maestro(this); } } @@ -192,90 +58,53 @@ BoostContext::~BoostContext() if (not this->stack_) delete this->fc_; #endif - if (this == maestro_context_) - maestro_context_ = nullptr; - SIMIX_context_stack_delete(this->stack_); -} - -// BoostSerialContext - -void BoostContext::resume() -{ - SIMIX_context_set_current(this); - smx_ctx_boost_jump_fcontext(maestro_context_, this); -} - -void BoostSerialContext::suspend() -{ - /* determine the next context */ - BoostSerialContext* 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); - } else { - /* all processes were run, return to maestro */ - XBT_DEBUG("No more process to run"); - next_context = static_cast(maestro_context_); - } - SIMIX_context_set_current(static_cast(next_context)); - smx_ctx_boost_jump_fcontext(this, next_context); } -void BoostSerialContext::stop() +void BoostContext::wrapper(BoostContext::arg_type arg) { - BoostContext::stop(); - throw StopRequest(); -} - -// BoostParallelContext - -#if HAVE_THREAD_CONTEXTS - -void BoostParallelContext::suspend() -{ - boost::optional next_work = parmap_->next(); - BoostParallelContext* next_context; - if (next_work) { - XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context); - } 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]); +#if BOOST_VERSION < 106100 + BoostContext* context = reinterpret_cast(arg); +#else + BoostContext* context = static_cast(arg.data)[1]; + ASAN_ONLY(xbt_assert(context->asan_ctx_ == static_cast(arg.data)[0])); + ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); + static_cast(arg.data)[0]->fc_ = arg.fctx; +#endif + try { + (*context)(); + } catch (StopRequest const&) { + XBT_DEBUG("Caught a StopRequest"); + } catch (simgrid::Exception const& e) { + XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get()); + throw; } - - SIMIX_context_set_current(static_cast(next_context)); - smx_ctx_boost_jump_fcontext(this, next_context); -} - -void BoostParallelContext::stop() -{ - BoostContext::stop(); - throw StopRequest(); + context->Context::stop(); + ASAN_ONLY(context->asan_stop_ = true); + context->suspend(); } -void BoostParallelContext::resume() +void BoostContext::swap_into(SwappedContext* to_) { - uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1); - xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); - - BoostParallelContext* worker_context = static_cast(SIMIX_context_self()); - workers_context_[worker_id] = worker_context; - - SIMIX_context_set_current(this); - smx_ctx_boost_jump_fcontext(worker_context, this); -} - + BoostContext* to = static_cast(to_); +#if BOOST_VERSION < 105600 + boost::context::jump_fcontext(this->fc_, to->fc_, reinterpret_cast(to)); +#elif BOOST_VERSION < 106100 + boost::context::jump_fcontext(&this->fc_, to->fc_, reinterpret_cast(to)); +#else + BoostContext* ctx[2] = {this, to}; + ASAN_ONLY(void* fake_stack = nullptr); + ASAN_ONLY(to->asan_ctx_ = from); + 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_ONLY(xbt_assert(from->asan_ctx_ == static_cast(arg.data)[0])); + ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); + static_cast(arg.data)[0]->fc_ = arg.fctx; #endif +} XBT_PRIVATE ContextFactory* boost_factory() { XBT_VERB("Using Boost contexts. Welcome to the 21th century."); return new BoostContextFactory(); } - }}} // namespace