X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a107fb48caa59bc8284aaf2f47a161132e39e9c..7e42dd535dfc0d68de20fba4b9fc5e480b56c74b:/src/kernel/context/ContextUnix.cpp diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index b4af204f3a..e2641444c2 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -5,13 +5,15 @@ /* \file UContext.cpp Context switching with ucontexts from System V */ -#include "ContextUnix.hpp" #include "context_private.hpp" #include "mc/mc.h" +#include "simgrid/Exception.hpp" #include "src/mc/mc_ignore.hpp" #include "src/simix/ActorImpl.hpp" +#include "ContextUnix.hpp" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); /** Many integers are needed to store a pointer @@ -30,31 +32,22 @@ namespace context { UContextFactory::UContextFactory() : ContextFactory("UContextFactory"), parallel_(SIMIX_context_is_parallel()) { - UContext::setMaestro(nullptr); - if (parallel_) { -#if HAVE_THREAD_CONTEXTS + UContext::set_maestro(nullptr); + if (parallel_) ParallelUContext::initialize(); -#else - xbt_die("No thread support for parallel context execution"); -#endif - } } UContextFactory::~UContextFactory() { -#if HAVE_THREAD_CONTEXTS if (parallel_) ParallelUContext::finalize(); -#endif } Context* UContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) { -#if HAVE_THREAD_CONTEXTS if (parallel_) return new_context(std::move(code), cleanup, process); else -#endif return new_context(std::move(code), cleanup, process); } @@ -64,11 +57,9 @@ Context* UContextFactory::create_context(std::function code, void_pfn_sm */ void UContextFactory::run_all() { -#if HAVE_THREAD_CONTEXTS if (parallel_) ParallelUContext::run_all(); else -#endif SerialUContext::run_all(); } @@ -121,10 +112,13 @@ void UContext::smx_ctx_sysv_wrapper(int i1, int i2) ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); try { (*context)(); - context->Context::stop(); } catch (simgrid::kernel::context::Context::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(); } @@ -143,7 +137,7 @@ void UContext::make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg) inline void UContext::swap(UContext* from, UContext* 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_); swapcontext(&from->uc_, &to->uc_); @@ -170,20 +164,20 @@ void SerialUContext::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"); - next_context = static_cast(UContext::getMaestro()); + next_context = static_cast(UContext::get_maestro()); } - SIMIX_context_set_current(next_context); + Context::set_current(next_context); UContext::swap(this, next_context); } void SerialUContext::resume() { - SIMIX_context_set_current(this); - UContext::swap(UContext::getMaestro(), this); + Context::set_current(this); + UContext::swap(UContext::get_maestro(), this); } void SerialUContext::run_all() @@ -192,16 +186,14 @@ void SerialUContext::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(); } // ParallelUContext -#if HAVE_THREAD_CONTEXTS - simgrid::xbt::Parmap* ParallelUContext::parmap_; std::atomic ParallelUContext::threads_working_; /* number of threads that have started their work */ -xbt_os_thread_key_t ParallelUContext::worker_id_key_; /* thread-specific storage for the thread id */ +thread_local uintptr_t ParallelUContext::worker_id_; /* thread-specific storage for the thread id */ std::vector ParallelUContext::workers_context_; /* space to save the worker's context * in each thread */ @@ -210,7 +202,6 @@ void ParallelUContext::initialize() parmap_ = nullptr; workers_context_.clear(); workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - xbt_os_thread_key_create(&worker_id_key_); } void ParallelUContext::finalize() @@ -218,7 +209,6 @@ void ParallelUContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelUContext::run_all() @@ -233,7 +223,7 @@ void ParallelUContext::run_all() parmap_ = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); parmap_->apply( [](smx_actor_t process) { - ParallelUContext* context = static_cast(process->context); + ParallelUContext* context = static_cast(process->context_); context->resume(); }, simix_global->process_to_run); @@ -255,18 +245,17 @@ void ParallelUContext::suspend() if (next_work) { // There is a next soul to embody (ie, 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"); - // Get back the identity of my body that was stored when starting the scheduling round - uintptr_t worker_id = reinterpret_cast(xbt_os_thread_get_specific(worker_id_key_)); + // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round // Deduce the initial soul of that body - next_context = workers_context_[worker_id]; + next_context = workers_context_[worker_id_]; // When given that soul, the body will wait for the next scheduling round } - SIMIX_context_set_current(next_context); + Context::set_current(next_context); // Get the next soul to run, either simulated or initial minion's one: UContext::swap(this, next_context); } @@ -274,16 +263,14 @@ void ParallelUContext::suspend() /** Run one particular simulated process on the current thread. */ void ParallelUContext::resume() { - // What is my containing body? - uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed); - // Store the number of my containing body in os-thread-specific area : - xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast(worker_id)); + // What is my containing body? Store its number in os-thread-specific area : + worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); // Get my current soul: - ParallelUContext* worker_context = static_cast(SIMIX_context_self()); + ParallelUContext* worker_context = static_cast(self()); // Write down that this soul is hosted in that body (for now) - workers_context_[worker_id] = worker_context; + workers_context_[worker_id_] = worker_context; // Write in simix that I switched my soul - SIMIX_context_set_current(this); + Context::set_current(this); // Actually do that using the relevant library call: UContext::swap(worker_context, this); // No body runs that soul anymore at this point. Instead the current body took the soul of simulated process The @@ -295,8 +282,6 @@ void ParallelUContext::resume() // initial soul of the current working thread } -#endif - XBT_PRIVATE ContextFactory* sysv_factory() { XBT_VERB("Activating SYSV context factory");