X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/001737a15701027974d89260771284a45013d2cd..3580b0137eab12ca216d9847823c86918b10dd53:/src/kernel/context/ContextThread.cpp diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index d246a3c258..f5a1f7a5e6 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2019. 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. */ @@ -7,14 +7,16 @@ #include "simgrid/Exception.hpp" #include "src/internal_config.h" /* loads context system definitions */ -#include "src/simix/smx_private.hpp" -#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ +#include "src/kernel/EngineImpl.hpp" #include "xbt/function_types.h" +#include "xbt/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ +#include #include +#include #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context); namespace simgrid { namespace kernel { @@ -22,21 +24,23 @@ namespace context { // ThreadContextFactory -ThreadContextFactory::ThreadContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel()) +ThreadContextFactory::ThreadContextFactory() : ContextFactory() { - if (parallel_) + if (stack_size != 8 * 1024 * 1024) + XBT_INFO("Stack size modifications are ignored by thread factory."); + if (is_parallel()) ParallelThreadContext::initialize(); } ThreadContextFactory::~ThreadContextFactory() { - if (parallel_) + if (is_parallel()) ParallelThreadContext::finalize(); } ThreadContext* ThreadContextFactory::create_context(std::function&& code, actor::ActorImpl* actor, bool maestro) { - if (parallel_) + if (is_parallel()) return this->new_context(std::move(code), actor, maestro); else return this->new_context(std::move(code), actor, maestro); @@ -44,7 +48,7 @@ ThreadContext* ThreadContextFactory::create_context(std::function&& code void ThreadContextFactory::run_all() { - if (parallel_) { + if (is_parallel()) { // Parallel execution ParallelThreadContext::run_all(); } else { @@ -56,13 +60,13 @@ void ThreadContextFactory::run_all() // ThreadContext ThreadContext::ThreadContext(std::function&& code, actor::ActorImpl* actor, bool maestro) - : AttachContext(std::move(code), actor), is_maestro_(maestro) + : AttachContext(std::move(code), actor, maestro) { /* If the user provided a function for the actor then use it */ if (has_code()) { /* create and start the actor */ this->thread_ = new std::thread(ThreadContext::wrapper, this); - /* wait the starting of the newly created actor */ + /* wait the start of the newly created actor */ this->end_.acquire(); } @@ -85,12 +89,7 @@ void ThreadContext::wrapper(ThreadContext* context) Context::set_current(context); #ifndef WIN32 - /* Install alternate signal stack, for SIGSEGV handler. */ - stack_t stack; - stack.ss_sp = sigsegv_stack; - stack.ss_size = sizeof sigsegv_stack; - stack.ss_flags = 0; - sigaltstack(&stack, nullptr); + install_sigsegv_stack(nullptr, true); #endif // Tell the caller (normally the maestro) we are starting, and wait for its green light context->end_.release(); @@ -98,23 +97,20 @@ void ThreadContext::wrapper(ThreadContext* context) try { (*context)(); - if (not context->is_maestro()) { // Just in case somebody detached maestro - context->Context::stop(); - context->stop_hook(); - } + if (not context->is_maestro()) // Just in case somebody detached maestro + context->stop(); } catch (ForcefulKillException const&) { XBT_DEBUG("Caught a ForcefulKillException in Thread::wrapper"); xbt_assert(not context->is_maestro(), "Maestro shall not receive ForcefulKillExceptions, even when detached."); } catch (simgrid::Exception const& e) { - XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get()); + XBT_INFO("Actor killed by an uncaught exception %s", boost::core::demangle(typeid(e).name()).c_str()); throw; } // Signal to the caller (normally the maestro) that we have finished: context->yield(); #ifndef WIN32 - stack.ss_flags = SS_DISABLE; - sigaltstack(&stack, nullptr); + install_sigsegv_stack(nullptr, false); #endif XBT_DEBUG("Terminating"); Context::set_current(nullptr); @@ -142,13 +138,6 @@ void ThreadContext::yield() this->end_.release(); } -void ThreadContext::stop() -{ - Context::stop(); - stop_hook(); - throw ForcefulKillException(); -} - void ThreadContext::suspend() { this->yield(); @@ -158,7 +147,7 @@ void ThreadContext::suspend() void ThreadContext::attach_start() { // We're breaking the layers here by depending on the upper layer: - ThreadContext* maestro = static_cast(simix_global->maestro_process->context_.get()); + auto* maestro = static_cast(EngineImpl::get_instance()->get_maestro()->context_.get()); maestro->begin_.release(); xbt_assert(not this->is_maestro()); this->start(); @@ -169,7 +158,7 @@ void ThreadContext::attach_stop() xbt_assert(not this->is_maestro()); this->yield(); - ThreadContext* maestro = static_cast(simix_global->maestro_process->context_.get()); + auto* maestro = static_cast(EngineImpl::get_instance()->get_maestro()->context_.get()); maestro->end_.acquire(); Context::set_current(nullptr); @@ -179,9 +168,10 @@ void ThreadContext::attach_stop() void SerialThreadContext::run_all() { - for (smx_actor_t const& actor : simix_global->actors_to_run) { + const auto& to_run = EngineImpl::get_instance()->get_actors_to_run(); + for (smx_actor_t const& actor : to_run) { XBT_DEBUG("Handling %p", actor); - ThreadContext* context = static_cast(actor->context_.get()); + auto* context = static_cast(actor->context_.get()); context->release(); context->wait(); } @@ -193,7 +183,7 @@ xbt::OsSemaphore* ParallelThreadContext::thread_sem_ = nullptr; void ParallelThreadContext::initialize() { - thread_sem_ = new xbt::OsSemaphore(SIMIX_context_get_nthreads()); + thread_sem_ = new xbt::OsSemaphore(get_nthreads()); } void ParallelThreadContext::finalize() @@ -204,9 +194,11 @@ void ParallelThreadContext::finalize() void ParallelThreadContext::run_all() { - for (smx_actor_t const& actor : simix_global->actors_to_run) + const auto& to_release = EngineImpl::get_instance()->get_actors_to_run(); + for (smx_actor_t const& actor : to_release) static_cast(actor->context_.get())->release(); - for (smx_actor_t const& actor : simix_global->actors_to_run) + const auto& to_wait = EngineImpl::get_instance()->get_actors_to_run(); + for (smx_actor_t const& actor : to_wait) static_cast(actor->context_.get())->wait(); }