X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/247fba2eee61dc2a8e06c6f1339437dcb4481c3b..0d8e66239690b90dd2ced42f6bacab683661b20f:/src/kernel/context/ContextSwapped.cpp diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 7a2de5b9bb..3d7740ff0c 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -3,10 +3,11 @@ /* 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/actor/ActorImpl.hpp" #include "src/kernel/context/context_private.hpp" -#include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.hpp" #include "xbt/parmap.hpp" @@ -42,12 +43,8 @@ SwappedContextFactory::SwappedContextFactory() : ContextFactory(), parallel_(SIM parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel) workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr); } -SwappedContextFactory::~SwappedContextFactory() -{ - delete parmap_; -} -SwappedContext::SwappedContext(std::function code, smx_actor_t actor, SwappedContextFactory* factory) +SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, SwappedContextFactory* factory) : Context(std::move(code), actor), factory_(factory) { // Save maestro (=context created first) in preparation for run_all @@ -55,6 +52,7 @@ SwappedContext::SwappedContext(std::function code, smx_actor_t actor, Sw factory_->workers_context_[0] = this; if (has_code()) { + xbt_assert((smx_context_stack_size & 0xf) == 0, "smx_context_stack_size should be multiple of 16"); if (smx_context_guard_size > 0 && not MC_is_active()) { #if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1) @@ -70,14 +68,16 @@ SwappedContext::SwappedContext(std::function code, smx_actor_t actor, Sw #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 @@ -92,20 +92,19 @@ SwappedContext::SwappedContext(std::function code, smx_actor_t actor, Sw /* 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_ = static_cast(this->stack_) + smx_context_usable_stack_size); + ASAN_ONLY(this->asan_stack_ = this->stack_ + smx_context_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); + if (RUNNING_ON_VALGRIND) + this->valgrind_stack_id_ = VALGRIND_STACK_REGISTER(this->stack_, this->stack_ + smx_context_stack_size); #endif } } @@ -116,21 +115,20 @@ SwappedContext::~SwappedContext() return; #if HAVE_VALGRIND_H - unsigned int valgrind_stack_id; - memcpy(&valgrind_stack_id, (char*)stack_ + smx_context_usable_stack_size, sizeof valgrind_stack_id); - VALGRIND_STACK_DEREGISTER(valgrind_stack_id); + if (RUNNING_ON_VALGRIND) + 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 */ @@ -138,7 +136,7 @@ SwappedContext::~SwappedContext() xbt_free(stack_); } -void* SwappedContext::get_stack() +unsigned char* SwappedContext::get_stack() { return stack_; } @@ -147,7 +145,7 @@ void SwappedContext::stop() { Context::stop(); /* We must cut the actor execution using an exception to properly free the C++ RAII variables */ - throw StopRequest(); + throw ForcefulKillException(); } /** Maestro wants to run all ready actors */ @@ -162,7 +160,8 @@ void SwappedContextFactory::run_all() // We lazily create the parmap so that all options are actually processed when doing so. if (parmap_ == nullptr) - parmap_ = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); + 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: @@ -172,7 +171,7 @@ void SwappedContextFactory::run_all() // - So, resume() is only launched from the parmap for the first job of each minion. parmap_->apply( [](smx_actor_t process) { - SwappedContext* context = static_cast(process->context_); + SwappedContext* context = static_cast(process->context_.get()); context->resume(); }, simix_global->actors_to_run); @@ -184,7 +183,7 @@ void SwappedContextFactory::run_all() 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(); } } @@ -231,7 +230,7 @@ void SwappedContext::suspend() 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 actors to run"); @@ -253,7 +252,7 @@ void SwappedContext::suspend() if (i < simix_global->actors_to_run.size()) { /* Actually swap into the next actor directly without transiting to maestro */ XBT_DEBUG("Run next actor"); - next_context = static_cast(simix_global->actors_to_run[i]->context_); + 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 actors to run");