X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd077da6be23eb5a0682927d41d8fb104b846aea..03ce6a2e7863fe994d12ca8ab9141b4f6fdb5f8e:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index a9422e0d0c..256f677f62 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -1,24 +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 "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 "simgrid/Exception.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -88,7 +76,7 @@ BoostContext::BoostContext(std::function code, void_pfn_smxprocess_t cle #else void* stack = this->stack_; #endif - ASAN_EVAL(this->asan_stack_ = stack); + 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 @@ -119,18 +107,21 @@ void BoostContext::wrapper(BoostContext::arg_type arg) #if BOOST_VERSION < 106100 BoostContext* context = reinterpret_cast(arg); #else - ASAN_FINISH_SWITCH(nullptr, &static_cast(arg.data)[0]->asan_stack_, - &static_cast(arg.data)[0]->asan_stack_size_); + 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; - BoostContext* context = static_cast(arg.data)[1]; #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; } - ASAN_EVAL(context->asan_stop_ = true); + context->Context::stop(); + ASAN_ONLY(context->asan_stop_ = true); context->suspend(); } @@ -142,11 +133,12 @@ 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; + 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_FINISH_SWITCH(fake_stack, &static_cast(arg.data)[0]->asan_stack_, - &static_cast(arg.data)[0]->asan_stack_size_); + 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 } @@ -171,7 +163,7 @@ void SerialBoostContext::suspend() 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"); @@ -194,7 +186,7 @@ void SerialBoostContext::run_all() smx_actor_t first_process = simix_global->process_to_run.front(); process_index_ = 1; /* execute the first process */ - static_cast(first_process->context)->resume(); + static_cast(first_process->context_)->resume(); } // ParallelBoostContext @@ -202,8 +194,8 @@ void SerialBoostContext::run_all() #if HAVE_THREAD_CONTEXTS simgrid::xbt::Parmap* ParallelBoostContext::parmap_; -uintptr_t ParallelBoostContext::threads_working_; -xbt_os_thread_key_t ParallelBoostContext::worker_id_key_; +std::atomic ParallelBoostContext::threads_working_; +thread_local uintptr_t ParallelBoostContext::worker_id_; std::vector ParallelBoostContext::workers_context_; void ParallelBoostContext::initialize() @@ -211,7 +203,6 @@ 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() @@ -219,7 +210,6 @@ void ParallelBoostContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelBoostContext::run_all() @@ -229,7 +219,7 @@ void ParallelBoostContext::run_all() 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); + ParallelBoostContext* context = static_cast(process->context_); context->resume(); }, simix_global->process_to_run); @@ -241,11 +231,10 @@ void ParallelBoostContext::suspend() ParallelBoostContext* next_context; if (next_work) { XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context); + 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 = workers_context_[worker_id]; + next_context = workers_context_[worker_id_]; } SIMIX_context_set_current(next_context); @@ -254,11 +243,10 @@ void ParallelBoostContext::suspend() void ParallelBoostContext::resume() { - uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1); - xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); + 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; + workers_context_[worker_id_] = worker_context; SIMIX_context_set_current(this); BoostContext::swap(worker_context, this);