X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd4a6bff769c06de3840b08926eccf0734642f57..87221a3cfb8b1464278294d99bce42d27d2f9382:/src/kernel/context/ContextSwapped.cpp diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 5716b0c5c1..eb4e41b081 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2022. 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. */ @@ -8,6 +8,7 @@ #include "src/internal_config.h" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" +#include "src/sthread/sthread.h" // sthread_inside_simgrid #include "xbt/parmap.hpp" #include "src/kernel/context/ContextSwapped.hpp" @@ -38,7 +39,7 @@ #include #endif -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context); // The name of this function is currently hardcoded in MC (as string). // Do not change it without fixing those references as well. @@ -48,11 +49,15 @@ void smx_ctx_wrapper(simgrid::kernel::context::SwappedContext* context) __sanitizer_finish_switch_fiber(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); #endif try { + sthread_inside_simgrid = 0; (*context)(); - context->Context::stop(); + sthread_inside_simgrid = 1; + context->stop(); } catch (simgrid::ForcefulKillException const&) { + sthread_inside_simgrid = 1; XBT_DEBUG("Caught a ForcefulKillException"); } catch (simgrid::Exception const& e) { + sthread_inside_simgrid = 1; XBT_INFO("Actor killed by an uncaught exception %s", boost::core::demangle(typeid(e).name()).c_str()); throw; } @@ -63,23 +68,21 @@ void smx_ctx_wrapper(simgrid::kernel::context::SwappedContext* context) THROW_IMPOSSIBLE; } -namespace simgrid { -namespace kernel { -namespace context { +namespace simgrid::kernel::context { /* thread-specific storage for the worker's context */ thread_local SwappedContext* SwappedContext::worker_context_ = nullptr; -SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, SwappedContextFactory* factory) - : Context(std::move(code), actor), factory_(*factory) +SwappedContext::SwappedContext(std::function&& code, actor::ActorImpl* actor, SwappedContextFactory* factory) + : Context(std::move(code), actor, not code /* maestro if no code */), factory_(*factory) { // Save maestro (=first created context) in preparation for run_all - if (not SIMIX_context_is_parallel() && factory_.maestro_context_ == nullptr) + if (not is_parallel() && factory_.maestro_context_ == nullptr) factory_.maestro_context_ = this; if (has_code()) { xbt_assert((actor->get_stacksize() & 0xf) == 0, "Actor stack size should be multiple of 16"); - if (smx_context_guard_size > 0 && not MC_is_active()) { + if (guard_size > 0 && not MC_is_active()) { #if PTH_STACKGROWTH != -1 xbt_die( "Stack overflow protection is known to be broken on your system: you stacks grow upwards (or detection is " @@ -89,7 +92,7 @@ SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, * Protected pages need to be put after the stack when PTH_STACKGROWTH == 1. */ #endif - size_t size = actor->get_stacksize() + smx_context_guard_size; + size_t size = actor->get_stacksize() + guard_size; #if SIMGRID_HAVE_MC /* Cannot use posix_memalign when SIMGRID_HAVE_MC. Align stack by hand, and save the * pointer returned by xbt_malloc0. */ @@ -107,7 +110,7 @@ SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, #ifndef _WIN32 /* This is fatal. We are going to fail at some point when we try reusing this. */ xbt_assert( - mprotect(this->stack_, smx_context_guard_size, PROT_NONE) != -1, + mprotect(this->stack_, guard_size, PROT_NONE) != -1, "Failed to protect stack: %s.\n" "If you are running a lot of actors, you may be exceeding the amount of mappings allowed per process.\n" "On Linux systems, change this value with sudo sysctl -w vm.max_map_count=newvalue (default value: 65536)\n" @@ -115,7 +118,7 @@ SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, "for more information.", strerror(errno)); #endif - this->stack_ = this->stack_ + smx_context_guard_size; + this->stack_ = this->stack_ + guard_size; } else { this->stack_ = static_cast(xbt_malloc0(actor->get_stacksize())); } @@ -152,14 +155,14 @@ SwappedContext::~SwappedContext() #endif #ifndef _WIN32 - if (smx_context_guard_size > 0 && not MC_is_active()) { - stack_ = stack_ - smx_context_guard_size; - if (mprotect(stack_, smx_context_guard_size, PROT_READ | PROT_WRITE) == -1) { + if (guard_size > 0 && not MC_is_active()) { + stack_ = stack_ - guard_size; + if (mprotect(stack_, 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. */ + /* Retrieve the saved pointer. See the initialization above. */ stack_ = reinterpret_cast(stack_)[-1]; #endif } @@ -178,13 +181,6 @@ unsigned char* SwappedContext::get_stack_bottom() const #endif } -void SwappedContext::stop() -{ - Context::stop(); - /* We must cut the actor execution using an exception to properly free the C++ RAII variables */ - throw ForcefulKillException(); -} - void SwappedContext::swap_into(SwappedContext* to) { #if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT @@ -204,18 +200,17 @@ void SwappedContext::swap_into(SwappedContext* to) } /** Maestro wants to run all ready actors */ -void SwappedContextFactory::run_all() +void SwappedContextFactory::run_all(std::vector const& actors_list) { const auto* engine = EngineImpl::get_instance(); /* This function is called by maestro at the beginning of a scheduling round to get all working threads executing some * stuff It is much easier to understand what happens if you see the working threads as bodies that swap their soul * for the ones of the simulated processes that must run. */ - if (SIMIX_context_is_parallel()) { + if (is_parallel()) { // We lazily create the parmap so that all options are actually processed when doing so. if (parmap_ == nullptr) - parmap_ = std::make_unique>(SIMIX_context_get_nthreads(), - SIMIX_context_get_parallel_mode()); + parmap_ = std::make_unique>(get_nthreads(), 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: @@ -228,9 +223,9 @@ void SwappedContextFactory::run_all() auto* context = static_cast(actor->context_.get()); context->resume(); }, - engine->get_actors_to_run()); + actors_list); } else { // sequential execution - if (not engine->has_actors_to_run()) + if (actors_list.empty()) return; /* maestro is already saved in the first slot of workers_context_ */ @@ -250,10 +245,11 @@ void SwappedContextFactory::run_all() void SwappedContext::resume() { auto* old = static_cast(self()); - if (SIMIX_context_is_parallel()) { + if (is_parallel()) { // Save my current soul (either maestro, or one of the minions) in a thread-specific area worker_context_ = old; } + sthread_inside_simgrid = 0; // Switch my soul and the actor's one Context::set_current(this); old->swap_into(this); @@ -272,9 +268,9 @@ void SwappedContext::resume() void SwappedContext::suspend() { SwappedContext* next_context; - if (SIMIX_context_is_parallel()) { + if (is_parallel()) { // Get some more work to directly swap into the next executable actor instead of yielding back to the parmap - boost::optional next_work = factory_.parmap_->next(); + boost::optional next_work = factory_.parmap_->next(); if (next_work) { // There is a next soul to embody (ie, another executable actor) XBT_DEBUG("Run next process"); @@ -295,10 +291,12 @@ void SwappedContext::suspend() if (i < engine->get_actor_to_run_count()) { /* Actually swap into the next actor directly without transiting to maestro */ XBT_DEBUG("Run next actor"); + sthread_inside_simgrid = 0; next_context = static_cast(engine->get_actor_to_run_at(i)->context_.get()); } else { /* all processes were run, actually return to maestro */ XBT_DEBUG("No more actors to run"); + sthread_inside_simgrid = 1; next_context = factory_.maestro_context_; } } @@ -306,6 +304,4 @@ void SwappedContext::suspend() this->swap_into(next_context); } -} // namespace context -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::context