X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..2fb1fa1697309cad26ab7d472db4f8bfa617e0b4:/src/kernel/context/ContextRaw.cpp diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 90e0d8e384..423f13dc0f 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -1,11 +1,13 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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 "ContextRaw.hpp" - +#include "context_private.hpp" #include "mc/mc.h" +#include "simgrid/Exception.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -235,6 +237,11 @@ RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup { if (has_code()) { this->stack_ = SIMIX_context_stack_new(); +#if PTH_STACKGROWTH == -1 + ASAN_ONLY(this->asan_stack_ = static_cast(this->stack_) + smx_context_usable_stack_size); +#else + ASAN_ONLY(this->asan_stack_ = this->stack_); +#endif this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this); } else { if (process != nullptr && maestro_context_ == nullptr) @@ -252,18 +259,28 @@ RawContext::~RawContext() void RawContext::wrapper(void* arg) { RawContext* context = static_cast(arg); + ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); 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 RawContext::swap(RawContext* from, RawContext* 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_); raw_swapcontext(&from->stack_top_, to->stack_top_); + ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); } void RawContext::stop() @@ -285,7 +302,7 @@ void SerialRawContext::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"); @@ -307,7 +324,7 @@ void SerialRawContext::run_all() return; smx_actor_t first_process = simix_global->process_to_run.front(); process_index_ = 1; - static_cast(first_process->context)->resume(); + static_cast(first_process->context_)->resume(); } // ParallelRawContext @@ -316,7 +333,7 @@ void SerialRawContext::run_all() simgrid::xbt::Parmap* ParallelRawContext::parmap_; std::atomic ParallelRawContext::threads_working_; /* number of threads that have started their work */ -xbt_os_thread_key_t ParallelRawContext::worker_id_key_; /* thread-specific storage for the thread id */ +uintptr_t thread_local ParallelRawContext::worker_id_; /* thread-specific storage for the thread id */ std::vector ParallelRawContext::workers_context_; /* space to save the worker context in each thread */ @@ -325,7 +342,6 @@ void ParallelRawContext::initialize() parmap_ = nullptr; workers_context_.clear(); workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - xbt_os_thread_key_create(&worker_id_key_); } void ParallelRawContext::finalize() @@ -333,7 +349,6 @@ void ParallelRawContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelRawContext::run_all() @@ -343,7 +358,7 @@ void ParallelRawContext::run_all() parmap_ = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); parmap_->apply( [](smx_actor_t process) { - ParallelRawContext* context = static_cast(process->context); + ParallelRawContext* context = static_cast(process->context_); context->resume(); }, simix_global->process_to_run); @@ -357,13 +372,12 @@ void ParallelRawContext::suspend() if (next_work) { /* there is a next process to resume */ XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context); + next_context = static_cast(next_work.get()->context_); } else { /* all processes were run, go to the barrier */ 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]; - XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, threads_working_.load()); + next_context = workers_context_[worker_id_]; + XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load()); } SIMIX_context_set_current(next_context); @@ -372,11 +386,10 @@ void ParallelRawContext::suspend() void ParallelRawContext::resume() { - uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed); - xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); + worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); ParallelRawContext* worker_context = static_cast(SIMIX_context_self()); - workers_context_[worker_id] = worker_context; - XBT_DEBUG("Saving worker stack %zu", worker_id); + workers_context_[worker_id_] = worker_context; + XBT_DEBUG("Saving worker stack %zu", worker_id_); SIMIX_context_set_current(this); RawContext::swap(worker_context, this); }