X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b89437671ba572a199dd4ff5766ba82720cdf03..ee81ba5e68da9e76d0886e17941b1567ddc07831:/src/kernel/context/ContextThread.cpp diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 42d2be6304..c6901c9628 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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,64 +7,62 @@ #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 { -namespace context { +namespace simgrid::kernel::context { // ThreadContextFactory ThreadContextFactory::ThreadContextFactory() : ContextFactory() { - if (smx_context_stack_size != 8 * 1024 * 1024) + if (stack_size != 8 * 1024 * 1024) XBT_INFO("Stack size modifications are ignored by thread factory."); - if (SIMIX_context_is_parallel()) + if (is_parallel()) ParallelThreadContext::initialize(); } ThreadContextFactory::~ThreadContextFactory() { - if (SIMIX_context_is_parallel()) + if (is_parallel()) ParallelThreadContext::finalize(); } ThreadContext* ThreadContextFactory::create_context(std::function&& code, actor::ActorImpl* actor, bool maestro) { - if (SIMIX_context_is_parallel()) + if (is_parallel()) return this->new_context(std::move(code), actor, maestro); else return this->new_context(std::move(code), actor, maestro); } -void ThreadContextFactory::run_all() +void ThreadContextFactory::run_all(std::vector const& actors_list) { - if (SIMIX_context_is_parallel()) { - // Parallel execution - ParallelThreadContext::run_all(); - } else { - // Serial execution - SerialThreadContext::run_all(); - } + if (is_parallel()) + ParallelThreadContext::run_all(actors_list); + + else + SerialThreadContext::run_all(actors_list); } // 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(); } @@ -86,38 +84,26 @@ 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); -#endif + install_sigsegv_stack(true); // Tell the caller (normally the maestro) we are starting, and wait for its green light context->end_.release(); context->start(); 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 uncaught 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); -#endif + install_sigsegv_stack(false); XBT_DEBUG("Terminating"); Context::set_current(nullptr); } @@ -144,13 +130,6 @@ void ThreadContext::yield() this->end_.release(); } -void ThreadContext::stop() -{ - Context::stop(); - stop_hook(); - throw ForcefulKillException(); -} - void ThreadContext::suspend() { this->yield(); @@ -160,7 +139,7 @@ void ThreadContext::suspend() void ThreadContext::attach_start() { // We're breaking the layers here by depending on the upper layer: - auto* maestro = static_cast(simix_global->maestro_->context_.get()); + auto* maestro = static_cast(EngineImpl::get_instance()->get_maestro()->context_.get()); maestro->begin_.release(); xbt_assert(not this->is_maestro()); this->start(); @@ -171,7 +150,7 @@ void ThreadContext::attach_stop() xbt_assert(not this->is_maestro()); this->yield(); - auto* maestro = static_cast(simix_global->maestro_->context_.get()); + auto* maestro = static_cast(EngineImpl::get_instance()->get_maestro()->context_.get()); maestro->end_.acquire(); Context::set_current(nullptr); @@ -179,9 +158,9 @@ void ThreadContext::attach_stop() // SerialThreadContext -void SerialThreadContext::run_all() +void SerialThreadContext::run_all(std::vector const& actors_list) { - for (smx_actor_t const& actor : simix_global->actors_to_run) { + for (auto const* actor : actors_list) { XBT_DEBUG("Handling %p", actor); auto* context = static_cast(actor->context_.get()); context->release(); @@ -195,7 +174,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,11 +183,12 @@ void ParallelThreadContext::finalize() thread_sem_ = nullptr; } -void ParallelThreadContext::run_all() +void ParallelThreadContext::run_all(std::vector const& actors_list) { - for (smx_actor_t const& actor : simix_global->actors_to_run) + for (auto const* actor : actors_list) static_cast(actor->context_.get())->release(); - for (smx_actor_t const& actor : simix_global->actors_to_run) + + for (auto const* actor : actors_list) static_cast(actor->context_.get())->wait(); } @@ -229,6 +209,4 @@ XBT_PRIVATE ContextFactory* thread_factory() XBT_VERB("Activating thread context factory"); return new ThreadContextFactory(); } -} // namespace context -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::context