X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28b5150327b910baeb296a2587c7175a65f2bff7..e4bdd31e7ef80a47732508c06ef157692be13f94:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index a0fb566231..b3d609b9ef 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -5,6 +5,7 @@ #include "ContextBoost.hpp" #include "context_private.hpp" +#include "simgrid/Exception.hpp" #include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -18,56 +19,41 @@ namespace context { BoostContextFactory::BoostContextFactory() : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel()) { - BoostContext::setMaestro(nullptr); - if (parallel_) { -#if HAVE_THREAD_CONTEXTS - ParallelBoostContext::initialize(); -#else - xbt_die("No thread support for parallel context execution"); -#endif - } + BoostContext::set_maestro(nullptr); + if (parallel_) + SwappedContext::initialize(); } BoostContextFactory::~BoostContextFactory() { -#if HAVE_THREAD_CONTEXTS if (parallel_) - ParallelBoostContext::finalize(); -#endif + SwappedContext::finalize(); } smx_context_t BoostContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t 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); + return this->new_context(std::move(code), cleanup_func, process); } void BoostContextFactory::run_all() { -#if HAVE_THREAD_CONTEXTS if (parallel_) ParallelBoostContext::run_all(); else -#endif - SerialBoostContext::run_all(); + SwappedContext::run_all(); } // BoostContext -BoostContext* BoostContext::maestro_context_ = nullptr; - BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) - : Context(std::move(code), cleanup_func, process) + : SwappedContext(std::move(code), cleanup_func, process) { /* 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: */ #if PTH_STACKGROWTH == -1 @@ -85,8 +71,8 @@ BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cle #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); } } @@ -96,9 +82,8 @@ BoostContext::~BoostContext() if (not this->stack_) delete this->fc_; #endif - if (this == maestro_context_) - maestro_context_ = nullptr; - SIMIX_context_stack_delete(this->stack_); + if (this == get_maestro()) + set_maestro(nullptr); } void BoostContext::wrapper(BoostContext::arg_type arg) @@ -113,22 +98,26 @@ 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(); } -inline void BoostContext::swap(BoostContext* from, BoostContext* to) +void BoostContext::swap_into(SwappedContext* to_) { + BoostContext* to = static_cast(to_); #if BOOST_VERSION < 105600 - boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast(to)); + boost::context::jump_fcontext(this->fc_, to->fc_, reinterpret_cast(to)); #elif BOOST_VERSION < 106100 - boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast(to)); + boost::context::jump_fcontext(&this->fc_, to->fc_, reinterpret_cast(to)); #else - BoostContext* ctx[2] = {from, to}; + 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_); @@ -145,69 +134,8 @@ void BoostContext::stop() throw StopRequest(); } -// SerialBoostContext - -unsigned long SerialBoostContext::process_index_; - -void SerialBoostContext::suspend() -{ - /* determine the next context */ - SerialBoostContext* 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(BoostContext::getMaestro()); - } - SIMIX_context_set_current(next_context); - BoostContext::swap(this, next_context); -} - -void SerialBoostContext::resume() -{ - SIMIX_context_set_current(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_; -thread_local uintptr_t ParallelBoostContext::worker_id_; -std::vector ParallelBoostContext::workers_context_; - -void ParallelBoostContext::initialize() -{ - parmap_ = nullptr; - workers_context_.clear(); - workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); -} - -void ParallelBoostContext::finalize() -{ - delete parmap_; - parmap_ = nullptr; - workers_context_.clear(); -} - void ParallelBoostContext::run_all() { threads_working_ = 0; @@ -224,7 +152,7 @@ void ParallelBoostContext::run_all() void ParallelBoostContext::suspend() { boost::optional next_work = parmap_->next(); - ParallelBoostContext* next_context; + SwappedContext* next_context; if (next_work) { XBT_DEBUG("Run next process"); next_context = static_cast(next_work.get()->context_); @@ -233,22 +161,21 @@ void ParallelBoostContext::suspend() next_context = workers_context_[worker_id_]; } - SIMIX_context_set_current(next_context); - BoostContext::swap(this, next_context); + Context::set_current(next_context); + this->swap_into(next_context); } void ParallelBoostContext::resume() { worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); - ParallelBoostContext* worker_context = static_cast(SIMIX_context_self()); - workers_context_[worker_id_] = worker_context; + SwappedContext* worker_context = static_cast(self()); + workers_context_[worker_id_] = worker_context; - SIMIX_context_set_current(this); - BoostContext::swap(worker_context, this); + Context::set_current(this); + worker_context->swap_into(this); } -#endif XBT_PRIVATE ContextFactory* boost_factory() {