X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28b5150327b910baeb296a2587c7175a65f2bff7..3baaf982217fbc818965e8ed71c3ec91e96844d5:/src/kernel/context/ContextRaw.cpp diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index f76faf604c..ffffc650d1 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -6,6 +6,7 @@ #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); @@ -185,212 +186,59 @@ namespace context { // RawContextFactory -RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel()) -{ - RawContext::setMaestro(nullptr); - if (parallel_) { -#if HAVE_THREAD_CONTEXTS - // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1 - ParallelRawContext::initialize(); -#else - xbt_die("You asked for a parallel execution, but you don't have any threads."); -#endif - } -} - -RawContextFactory::~RawContextFactory() -{ -#if HAVE_THREAD_CONTEXTS - if (parallel_) - ParallelRawContext::finalize(); -#endif -} - Context* RawContextFactory::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); -} - -void RawContextFactory::run_all() -{ -#if HAVE_THREAD_CONTEXTS - if (parallel_) - ParallelRawContext::run_all(); - else -#endif - SerialRawContext::run_all(); + return this->new_context(std::move(code), cleanup_func, process, this); } // RawContext -RawContext* RawContext::maestro_context_ = nullptr; - -RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) - : Context(std::move(code), cleanup, process) +RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t actor, + SwappedContextFactory* factory) + : SwappedContext(std::move(code), cleanup, actor, factory) { 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); + ASAN_ONLY(this->asan_stack_ = static_cast(get_stack()) + smx_context_usable_stack_size); #else - ASAN_ONLY(this->asan_stack_ = this->stack_); + ASAN_ONLY(this->asan_stack_ = get_stack()); #endif - this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this); + this->stack_top_ = raw_makecontext(get_stack(), smx_context_usable_stack_size, RawContext::wrapper, this); } else { - if (process != nullptr && maestro_context_ == nullptr) - maestro_context_ = this; if (MC_is_active()) - MC_ignore_heap(&maestro_context_->stack_top_, sizeof(maestro_context_->stack_top_)); + MC_ignore_heap(&stack_top_, sizeof(stack_top_)); } } -RawContext::~RawContext() -{ - SIMIX_context_stack_delete(this->stack_); -} - 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) +void RawContext::swap_into(SwappedContext* to_) { + RawContext* to = static_cast(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() -{ - Context::stop(); - throw StopRequest(); -} - -// SerialRawContext - -unsigned long SerialRawContext::process_index_; /* index of the next process to run in the list of runnable processes */ - -void SerialRawContext::suspend() -{ - /* determine the next context */ - SerialRawContext* 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(RawContext::getMaestro()); - } - SIMIX_context_set_current(next_context); - RawContext::swap(this, next_context); -} - -void SerialRawContext::resume() -{ - SIMIX_context_set_current(this); - RawContext::swap(RawContext::getMaestro(), this); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); + raw_swapcontext(&this->stack_top_, to->stack_top_); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); } -void SerialRawContext::run_all() -{ - if (simix_global->process_to_run.empty()) - return; - smx_actor_t first_process = simix_global->process_to_run.front(); - process_index_ = 1; - static_cast(first_process->context_)->resume(); -} - -// ParallelRawContext - -#if HAVE_THREAD_CONTEXTS - -simgrid::xbt::Parmap* ParallelRawContext::parmap_; -std::atomic ParallelRawContext::threads_working_; /* number of threads that have started their work */ -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 */ - -void ParallelRawContext::initialize() -{ - parmap_ = nullptr; - workers_context_.clear(); - workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); -} - -void ParallelRawContext::finalize() -{ - delete parmap_; - parmap_ = nullptr; - workers_context_.clear(); -} - -void ParallelRawContext::run_all() -{ - threads_working_ = 0; - if (parmap_ == nullptr) - 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_); - context->resume(); - }, - simix_global->process_to_run); -} - -void ParallelRawContext::suspend() -{ - /* determine the next context */ - boost::optional next_work = parmap_->next(); - ParallelRawContext* next_context; - if (next_work) { - /* there is a next process to resume */ - XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context_); - } else { - /* all processes were run, go to the barrier */ - XBT_DEBUG("No more processes to run"); - 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); - RawContext::swap(this, next_context); -} - -void ParallelRawContext::resume() -{ - 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_); - SIMIX_context_set_current(this); - RawContext::swap(worker_context, this); -} - -#endif - ContextFactory* raw_factory() { XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");