X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f1b0ef8689a9f9f47c12ea61b6aef187a8b6192..4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3:/src/kernel/context/ContextBoost.cpp diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 2b7be09f90..b458eed2e3 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -4,20 +4,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "ContextBoost.hpp" +#include "context_private.hpp" #include "src/simix/smx_private.hpp" -#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 - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); namespace simgrid { @@ -86,15 +75,15 @@ 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); + 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(); + this->fc_ = new boost::context_::fcontext_t(); #endif if (BoostContext::maestro_context_ == nullptr) BoostContext::maestro_context_ = this; @@ -115,12 +104,12 @@ BoostContext::~BoostContext() void BoostContext::wrapper(BoostContext::arg_type arg) { #if BOOST_VERSION < 106100 - BoostContext* context = reinterpret_cast(arg); + 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)(); @@ -128,23 +117,24 @@ void BoostContext::wrapper(BoostContext::arg_type arg) } catch (StopRequest const&) { XBT_DEBUG("Caught a StopRequest"); } - ASAN_EVAL(context->asan_stop_ = true); + ASAN_ONLY(context_->asan_stop_ = true); context->suspend(); } inline void BoostContext::swap(BoostContext* from, BoostContext* to) { #if BOOST_VERSION < 105600 - boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast(to)); + 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)); + boost::context_::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast(to)); #else BoostContext* ctx[2] = {from, to}; - void* fake_stack = nullptr; + 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 } @@ -169,7 +159,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"); @@ -192,7 +182,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 @@ -227,7 +217,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); @@ -239,7 +229,7 @@ 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_));