X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dfb4e2167c0963c8528f9534aa86816a1ec14e47..c8c2ca62f763f7872f2cecb38531705ed526fd5b:/src/kernel/context/ContextThread.cpp diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index a3c60882e0..ee7ba981bd 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-2021. 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,9 +8,10 @@ #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 "xbt/function_types.h" +#include "xbt/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ +#include #include #include @@ -22,31 +23,31 @@ namespace context { // ThreadContextFactory -ThreadContextFactory::ThreadContextFactory() - : ContextFactory("ThreadContextFactory"), parallel_(SIMIX_context_is_parallel()) +ThreadContextFactory::ThreadContextFactory() : ContextFactory() { - if (parallel_) + if (smx_context_stack_size != 8 * 1024 * 1024) + XBT_INFO("Stack size modifications are ignored by thread factory."); + if (SIMIX_context_is_parallel()) ParallelThreadContext::initialize(); } ThreadContextFactory::~ThreadContextFactory() { - if (parallel_) + if (SIMIX_context_is_parallel()) ParallelThreadContext::finalize(); } -ThreadContext* ThreadContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup, - smx_actor_t process, bool maestro) +ThreadContext* ThreadContextFactory::create_context(std::function&& code, actor::ActorImpl* actor, bool maestro) { - if (parallel_) - return this->new_context(std::move(code), cleanup, process, maestro); + if (SIMIX_context_is_parallel()) + return this->new_context(std::move(code), actor, maestro); else - return this->new_context(std::move(code), cleanup, process, maestro); + return this->new_context(std::move(code), actor, maestro); } void ThreadContextFactory::run_all() { - if (parallel_) { + if (SIMIX_context_is_parallel()) { // Parallel execution ParallelThreadContext::run_all(); } else { @@ -57,14 +58,14 @@ void ThreadContextFactory::run_all() // ThreadContext -ThreadContext::ThreadContext(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t actor, bool maestro) - : AttachContext(std::move(code), cleanup, actor), is_maestro_(maestro) +ThreadContext::ThreadContext(std::function&& code, actor::ActorImpl* actor, bool maestro) + : AttachContext(std::move(code), actor), is_maestro_(maestro) { - /* If the user provided a function for the process then use it */ + /* If the user provided a function for the actor then use it */ if (has_code()) { - /* create and start the process */ + /* create and start the actor */ this->thread_ = new std::thread(ThreadContext::wrapper, this); - /* wait the starting of the newly created process */ + /* wait the starting of the newly created actor */ this->end_.acquire(); } @@ -76,23 +77,18 @@ ThreadContext::ThreadContext(std::function code, void_pfn_smxprocess_t c ThreadContext::~ThreadContext() { - if (this->thread_) /* If there is a thread (maestro don't have any), wait for its termination */ + if (this->thread_) { /* Maestro don't have any thread */ thread_->join(); - delete thread_; + delete thread_; + } } -void *ThreadContext::wrapper(void *param) +void ThreadContext::wrapper(ThreadContext* context) { - ThreadContext* context = static_cast(param); 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(); @@ -100,24 +96,25 @@ void *ThreadContext::wrapper(void *param) try { (*context)(); - } catch (StopRequest const&) { - XBT_DEBUG("Caught a StopRequest"); - xbt_assert(not context->is_maestro(), "Maestro shall not receive StopRequests, even when detached."); + if (not context->is_maestro()) { // Just in case somebody detached maestro + context->Context::stop(); + context->stop_hook(); + } + } 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; } - if (not context->is_maestro()) // Just in case somebody detached maestro - context->Context::stop(); - // 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 - return nullptr; + XBT_DEBUG("Terminating"); + Context::set_current(nullptr); } void ThreadContext::release() @@ -145,7 +142,8 @@ void ThreadContext::yield() void ThreadContext::stop() { Context::stop(); - throw StopRequest(); + stop_hook(); + throw ForcefulKillException(); } void ThreadContext::suspend() @@ -157,7 +155,7 @@ void ThreadContext::suspend() void ThreadContext::attach_start() { // We're breaking the layers here by depending on the upper layer: - ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_; + auto* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->begin_.release(); xbt_assert(not this->is_maestro()); this->start(); @@ -168,7 +166,7 @@ void ThreadContext::attach_stop() xbt_assert(not this->is_maestro()); this->yield(); - ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_; + auto* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->end_.acquire(); Context::set_current(nullptr); @@ -178,9 +176,9 @@ void ThreadContext::attach_stop() void SerialThreadContext::run_all() { - for (smx_actor_t const& process : simix_global->process_to_run) { - XBT_DEBUG("Handling %p", process); - ThreadContext* context = static_cast(process->context_); + for (smx_actor_t const& actor : simix_global->actors_to_run) { + XBT_DEBUG("Handling %p", actor); + auto* context = static_cast(actor->context_.get()); context->release(); context->wait(); } @@ -203,10 +201,10 @@ void ParallelThreadContext::finalize() void ParallelThreadContext::run_all() { - for (smx_actor_t const& process : simix_global->process_to_run) - static_cast(process->context_)->release(); - for (smx_actor_t const& process : simix_global->process_to_run) - static_cast(process->context_)->wait(); + for (smx_actor_t const& actor : simix_global->actors_to_run) + static_cast(actor->context_.get())->release(); + for (smx_actor_t const& actor : simix_global->actors_to_run) + static_cast(actor->context_.get())->wait(); } void ParallelThreadContext::start_hook() @@ -226,4 +224,6 @@ XBT_PRIVATE ContextFactory* thread_factory() XBT_VERB("Activating thread context factory"); return new ThreadContextFactory(); } -}}} // namespace +} // namespace context +} // namespace kernel +} // namespace simgrid