X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa8c0aedd4f2031f1a7356a5b0ff6569ab262b64..d33a14dc048378e654595318c473d0386bc3b514:/src/kernel/context/ContextThread.cpp diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 01c084ed24..5f1f15975f 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -10,7 +10,6 @@ #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_os_thread.h" #include #include @@ -23,8 +22,7 @@ namespace context { // ThreadContextFactory -ThreadContextFactory::ThreadContextFactory() - : ContextFactory("ThreadContextFactory"), parallel_(SIMIX_context_is_parallel()) +ThreadContextFactory::ThreadContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel()) { if (parallel_) ParallelThreadContext::initialize(); @@ -36,13 +34,12 @@ ThreadContextFactory::~ThreadContextFactory() 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); + 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() @@ -58,38 +55,34 @@ 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()) { - if (smx_context_stack_size_was_set) - xbt_os_thread_setstacksize(smx_context_stack_size); - if (smx_context_guard_size_was_set) - xbt_os_thread_setguardsize(smx_context_guard_size); - - /* create and start the process */ - this->thread_ = xbt_os_thread_create(ThreadContext::wrapper, this); - /* wait the starting of the newly created process */ + /* create and start the actor */ + this->thread_ = new std::thread(ThreadContext::wrapper, this); + /* wait the starting of the newly created actor */ this->end_.acquire(); } /* Otherwise, we attach to the current thread */ else { - SIMIX_context_set_current(this); + Context::set_current(this); } } ThreadContext::~ThreadContext() { - if (this->thread_) /* If there is a thread (maestro don't have any), wait for its termination */ - xbt_os_thread_join(this->thread_, nullptr); + if (this->thread_) { /* Maestro don't have any thread */ + thread_->join(); + delete thread_; + } } -void *ThreadContext::wrapper(void *param) +void ThreadContext::wrapper(ThreadContext* context) { - ThreadContext* context = static_cast(param); - SIMIX_context_set_current(context); + Context::set_current(context); #ifndef WIN32 /* Install alternate signal stack, for SIGSEGV handler. */ @@ -105,16 +98,17 @@ 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", simgrid::xbt::demangle(typeid(e).name()).get()); 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(); @@ -122,7 +116,8 @@ void *ThreadContext::wrapper(void *param) stack.ss_flags = SS_DISABLE; sigaltstack(&stack, nullptr); #endif - return nullptr; + XBT_DEBUG("Terminating"); + Context::set_current(nullptr); } void ThreadContext::release() @@ -150,7 +145,8 @@ void ThreadContext::yield() void ThreadContext::stop() { Context::stop(); - throw StopRequest(); + stop_hook(); + throw ForcefulKillException(); } void ThreadContext::suspend() @@ -162,7 +158,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_; + ThreadContext* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->begin_.release(); xbt_assert(not this->is_maestro()); this->start(); @@ -173,19 +169,19 @@ void ThreadContext::attach_stop() xbt_assert(not this->is_maestro()); this->yield(); - ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_; + ThreadContext* maestro = static_cast(simix_global->maestro_->context_.get()); maestro->end_.acquire(); - SIMIX_context_set_current(nullptr); + Context::set_current(nullptr); } // SerialThreadContext 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); + ThreadContext* context = static_cast(actor->context_.get()); context->release(); context->wait(); } @@ -208,10 +204,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() @@ -231,4 +227,6 @@ XBT_PRIVATE ContextFactory* thread_factory() XBT_VERB("Activating thread context factory"); return new ThreadContextFactory(); } -}}} // namespace +} // namespace context +} // namespace kernel +} // namespace simgrid