X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6658e9f2ff4a24cc2e074c654f8f818be1d79089..82567f27fa74ddc2b6afa8d9b682bdde15fe3f9c:/src/kernel/context/ContextSwapped.cpp diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index e5cdd662b0..ccc04209b2 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -1,8 +1,9 @@ -/* 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. */ +#include "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" #include "src/internal_config.h" #include "src/kernel/context/context_private.hpp" @@ -11,7 +12,6 @@ #include "xbt/parmap.hpp" #include "src/kernel/context/ContextSwapped.hpp" -#include "src/kernel/context/ContextUnix.hpp" // FIXME: temporary reverse import #ifdef _WIN32 #include @@ -35,45 +35,22 @@ namespace simgrid { namespace kernel { namespace context { -/* Parallel execution */ -simgrid::xbt::Parmap* SwappedContext::parmap_; -std::atomic SwappedContext::threads_working_; /* number of threads that have started their work */ +/* rank of the execution thread */ thread_local uintptr_t SwappedContext::worker_id_; /* thread-specific storage for the thread id */ -std::vector SwappedContext::workers_context_; /* space to save the worker's context in each thread */ -SwappedContextFactory::SwappedContextFactory(std::string name) - : ContextFactory(name), parallel_(SIMIX_context_is_parallel()) -{ - SwappedContext::set_maestro(nullptr); - SwappedContext::initialize(parallel_); -} -SwappedContextFactory::~SwappedContextFactory() -{ - SwappedContext::finalize(); -} - -void SwappedContext::initialize(bool parallel) +SwappedContextFactory::SwappedContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel()) { parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel) - if (parallel) { - workers_context_.clear(); - workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - } + workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr); } -void SwappedContext::finalize() +SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, SwappedContextFactory* factory) + : Context(std::move(code), actor), factory_(factory) { - delete parmap_; - parmap_ = nullptr; - workers_context_.clear(); -} + // Save maestro (=context created first) in preparation for run_all + if (not factory->parallel_ && factory_->workers_context_[0] == nullptr) + factory_->workers_context_[0] = this; -SwappedContext* SwappedContext::maestro_context_ = nullptr; - -SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, - SwappedContextFactory* factory) - : Context(std::move(code), cleanup_func, process), factory_(factory) -{ if (has_code()) { if (smx_context_guard_size > 0 && not MC_is_active()) { @@ -90,14 +67,16 @@ SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t #if SIMGRID_HAVE_MC /* Cannot use posix_memalign when SIMGRID_HAVE_MC. Align stack by hand, and save the * pointer returned by xbt_malloc0. */ - char* alloc = (char*)xbt_malloc0(size + xbt_pagesize); - stack_ = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize; - *((void**)stack_ - 1) = alloc; + unsigned char* alloc = static_cast(xbt_malloc0(size + xbt_pagesize)); + stack_ = alloc - (reinterpret_cast(alloc) & (xbt_pagesize - 1)) + xbt_pagesize; + reinterpret_cast(stack_)[-1] = alloc; #elif !defined(_WIN32) - if (posix_memalign(&this->stack_, xbt_pagesize, size) != 0) + void* alloc; + if (posix_memalign(&alloc, xbt_pagesize, size) != 0) xbt_die("Failed to allocate stack."); + this->stack_ = static_cast(alloc); #else - this->stack_ = _aligned_malloc(size, xbt_pagesize); + this->stack_ = static_cast(_aligned_malloc(size, xbt_pagesize)); #endif #ifndef _WIN32 @@ -112,15 +91,19 @@ SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t /* This is fatal. We are going to fail at some point when we try reusing this. */ } #endif - this->stack_ = (char*)this->stack_ + smx_context_guard_size; + this->stack_ = this->stack_ + smx_context_guard_size; } else { - this->stack_ = xbt_malloc0(smx_context_stack_size); + this->stack_ = static_cast(xbt_malloc0(smx_context_stack_size)); } +#if PTH_STACKGROWTH == -1 + ASAN_ONLY(this->asan_stack_ = this->stack_ + smx_context_usable_stack_size); +#else + ASAN_ONLY(this->asan_stack_ = this->stack_); +#endif #if HAVE_VALGRIND_H - unsigned int valgrind_stack_id = - VALGRIND_STACK_REGISTER(this->stack_, (char*)this->stack_ + smx_context_stack_size); - memcpy((char*)this->stack_ + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id); + unsigned int valgrind_stack_id = VALGRIND_STACK_REGISTER(this->stack_, this->stack_ + smx_context_stack_size); + memcpy(this->stack_ + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id); #endif } } @@ -132,20 +115,20 @@ SwappedContext::~SwappedContext() #if HAVE_VALGRIND_H unsigned int valgrind_stack_id; - memcpy(&valgrind_stack_id, (char*)stack_ + smx_context_usable_stack_size, sizeof valgrind_stack_id); + memcpy(&valgrind_stack_id, stack_ + smx_context_usable_stack_size, sizeof valgrind_stack_id); VALGRIND_STACK_DEREGISTER(valgrind_stack_id); #endif #ifndef _WIN32 if (smx_context_guard_size > 0 && not MC_is_active()) { - stack_ = (char*)stack_ - smx_context_guard_size; + stack_ = stack_ - smx_context_guard_size; if (mprotect(stack_, smx_context_guard_size, PROT_READ | PROT_WRITE) == -1) { XBT_WARN("Failed to remove page protection: %s", strerror(errno)); /* try to pursue anyway */ } #if SIMGRID_HAVE_MC /* Retrieve the saved pointer. See SIMIX_context_stack_new above. */ - stack_ = *((void**)stack_ - 1); + stack_ = reinterpret_cast(stack_)[-1]; #endif } #endif /* not windows */ @@ -153,10 +136,16 @@ SwappedContext::~SwappedContext() xbt_free(stack_); } +unsigned char* SwappedContext::get_stack() +{ + return stack_; +} + void SwappedContext::stop() { Context::stop(); - throw StopRequest(); + /* We must cut the actor execution using an exception to properly free the C++ RAII variables */ + throw ForcefulKillException(); } /** Maestro wants to run all ready actors */ @@ -167,12 +156,12 @@ void SwappedContextFactory::run_all() * for the ones of the simulated processes that must run. */ if (parallel_) { - SwappedContext::threads_working_ = 0; + threads_working_ = 0; // We lazily create the parmap so that all options are actually processed when doing so. - if (SwappedContext::parmap_ == nullptr) - SwappedContext::parmap_ = - new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); + if (parmap_ == nullptr) + parmap_.reset( + new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode())); // Usually, Parmap::apply() executes the provided function on all elements of the array. // Here, the executed function does not return the control to the parmap before all the array is processed: @@ -180,19 +169,21 @@ void SwappedContextFactory::run_all() // the control to the parmap. Instead, it uses parmap_->next() to steal another work, and does it directly. // It only yields back to worker_context when the work array is exhausted. // - So, resume() is only launched from the parmap for the first job of each minion. - SwappedContext::parmap_->apply( + parmap_->apply( [](smx_actor_t process) { - SwappedContext* context = static_cast(process->context_); + SwappedContext* context = static_cast(process->context_.get()); context->resume(); }, - simix_global->process_to_run); + simix_global->actors_to_run); } else { // sequential execution - if (simix_global->process_to_run.empty()) + if (simix_global->actors_to_run.empty()) return; - smx_actor_t first_actor = simix_global->process_to_run.front(); + + /* maestro is already saved in the first slot of workers_context_ */ + smx_actor_t first_actor = simix_global->actors_to_run.front(); process_index_ = 1; /* execute the first actor; it will chain to the others when using suspend() */ - static_cast(first_actor->context_)->resume(); + static_cast(first_actor->context_.get())->resume(); } } @@ -206,24 +197,23 @@ void SwappedContext::resume() { if (factory_->parallel_) { // Save the thread number (my body) in an os-thread-specific area - worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); + worker_id_ = factory_->threads_working_.fetch_add(1, std::memory_order_relaxed); // Save my current soul (either maestro, or one of the minions) in a permanent area SwappedContext* worker_context = static_cast(self()); - workers_context_[worker_id_] = worker_context; + factory_->workers_context_[worker_id_] = worker_context; // Switch my soul and the actor's one Context::set_current(this); worker_context->swap_into(this); // No body runs that soul anymore at this point, but it is stored in a safe place. - // When the executed actor will do a blocking action, SIMIX_process_yield() will call suspend(), below. + // When the executed actor will do a blocking action, ActorImpl::yield() will call suspend(), below. } else { // sequential execution - // Maestro is always the calling thread of this function (ie, self() == maestro) SwappedContext* old = static_cast(self()); Context::set_current(this); old->swap_into(this); } } -/** The actor wants to yield back to maestro, because it is blocked in a simcall (ie in SIMIX_process_yield()) +/** The actor wants to yield back to maestro, because it is blocked in a simcall (i.e., in ActorImpl::yield()) * * Actually, it does not really yield back to maestro, but directly into the next executable actor. * @@ -235,37 +225,38 @@ void SwappedContext::suspend() { if (factory_->parallel_) { // Get some more work to directly swap into the next executable actor instead of yielding back to the parmap - boost::optional next_work = parmap_->next(); + boost::optional next_work = factory_->parmap_->next(); SwappedContext* next_context; if (next_work) { // There is a next soul to embody (ie, another executable actor) XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context_); + next_context = static_cast(next_work.get()->context_.get()); } else { // All actors were run, go back to the parmap context - XBT_DEBUG("No more processes to run"); + XBT_DEBUG("No more actors to run"); // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round - next_context = workers_context_[worker_id_]; + next_context = factory_->workers_context_[worker_id_]; // When given that soul, the body will wait for the next scheduling round } // Get the next soul to run, either from another actor or the initial minion's one Context::set_current(next_context); this->swap_into(next_context); + } else { // sequential execution /* determine the next context */ SwappedContext* next_context; unsigned long int i = factory_->process_index_; factory_->process_index_++; - if (i < simix_global->process_to_run.size()) { + if (i < simix_global->actors_to_run.size()) { /* Actually swap into the next actor directly without transiting to maestro */ - XBT_DEBUG("Run next process"); - next_context = static_cast(simix_global->process_to_run[i]->context_); + XBT_DEBUG("Run next actor"); + next_context = static_cast(simix_global->actors_to_run[i]->context_.get()); } else { /* all processes were run, actually return to maestro */ - XBT_DEBUG("No more process to run"); - next_context = static_cast(get_maestro()); + XBT_DEBUG("No more actors to run"); + next_context = factory_->workers_context_[0]; } Context::set_current(next_context); this->swap_into(next_context);