X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4bdd31e7ef80a47732508c06ef157692be13f94..2d37e348a09783cda723c7019640ee69de168324:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index b3d609b9ef..6153c41878 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2019. 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. */ @@ -15,41 +15,17 @@ namespace kernel { namespace context { // BoostContextFactory - -BoostContextFactory::BoostContextFactory() - : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel()) -{ - BoostContext::set_maestro(nullptr); - if (parallel_) - SwappedContext::initialize(); -} - -BoostContextFactory::~BoostContextFactory() -{ - if (parallel_) - SwappedContext::finalize(); -} - smx_context_t BoostContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) { - if (parallel_) - return this->new_context(std::move(code), cleanup_func, process); - return this->new_context(std::move(code), cleanup_func, process); -} - -void BoostContextFactory::run_all() -{ - if (parallel_) - ParallelBoostContext::run_all(); - else - SwappedContext::run_all(); + return this->new_context(std::move(code), cleanup_func, process, this); } // BoostContext -BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) - : SwappedContext(std::move(code), cleanup_func, process) +BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, + SwappedContextFactory* factory) + : SwappedContext(std::move(code), cleanup_func, actor, factory) { /* if the user provided a function for the process then use it, otherwise it is the context for maestro */ @@ -57,33 +33,29 @@ BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cle /* 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; + void* stack = static_cast(get_stack()) + smx_context_usable_stack_size; #else - void* stack = this->stack_; + void* stack = get_stack(); #endif - ASAN_ONLY(this->asan_stack_ = stack); #if BOOST_VERSION < 106100 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, BoostContext::wrapper); #endif + } else { #if BOOST_VERSION < 105600 this->fc_ = new boost::context::fcontext_t(); #endif - if (get_maestro() == nullptr) - set_maestro(this); } } BoostContext::~BoostContext() { #if BOOST_VERSION < 105600 - if (not this->stack_) + if (not get_stack()) delete this->fc_; #endif - if (this == get_maestro()) - set_maestro(nullptr); } void BoostContext::wrapper(BoostContext::arg_type arg) @@ -98,13 +70,13 @@ void BoostContext::wrapper(BoostContext::arg_type arg) #endif try { (*context)(); + context->Context::stop(); } 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; } - context->Context::stop(); ASAN_ONLY(context->asan_stop_ = true); context->suspend(); } @@ -119,64 +91,15 @@ void BoostContext::swap_into(SwappedContext* 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_); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->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_); + ASAN_ONLY(xbt_assert(this->asan_ctx_ == static_cast(arg.data)[0])); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); static_cast(arg.data)[0]->fc_ = arg.fctx; #endif } -void BoostContext::stop() -{ - Context::stop(); - throw StopRequest(); -} - -// ParallelBoostContext - -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(); - SwappedContext* 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"); - next_context = workers_context_[worker_id_]; - } - - Context::set_current(next_context); - this->swap_into(next_context); -} - -void ParallelBoostContext::resume() -{ - worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); - - SwappedContext* worker_context = static_cast(self()); - workers_context_[worker_id_] = worker_context; - - Context::set_current(this); - worker_context->swap_into(this); -} - - XBT_PRIVATE ContextFactory* boost_factory() { XBT_VERB("Using Boost contexts. Welcome to the 21th century.");