-/* 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. */
#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 <functional>
#include <utility>
// ThreadContextFactory
-ThreadContextFactory::ThreadContextFactory()
- : ContextFactory("ThreadContextFactory"), parallel_(SIMIX_context_is_parallel())
+ThreadContextFactory::ThreadContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel())
{
if (parallel_)
ParallelThreadContext::initialize();
ParallelThreadContext::finalize();
}
-ThreadContext* ThreadContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup,
- smx_actor_t process, bool maestro)
+ThreadContext* ThreadContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor, bool maestro)
{
if (parallel_)
- return this->new_context<ParallelThreadContext>(std::move(code), cleanup, process, maestro);
+ return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
else
- return this->new_context<SerialThreadContext>(std::move(code), cleanup, process, maestro);
+ return this->new_context<SerialThreadContext>(std::move(code), actor, maestro);
}
void ThreadContextFactory::run_all()
// ThreadContext
-ThreadContext::ThreadContext(std::function<void()> 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<void()>&& code, smx_actor_t 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 */
- /* NOTE: The first argument to xbt_os_thread_create used to be the process *
- * name, but now the name is stored at SIMIX level, so we pass a null */
- this->thread_ = xbt_os_thread_create(nullptr, ThreadContext::wrapper, this, 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<ThreadContext*>(param);
- SIMIX_context_set_current(context);
+ Context::set_current(context);
#ifndef WIN32
/* Install alternate signal stack, for SIGSEGV handler. */
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());
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();
stack.ss_flags = SS_DISABLE;
sigaltstack(&stack, nullptr);
#endif
- return nullptr;
+ XBT_DEBUG("Terminating");
+ Context::set_current(nullptr);
}
void ThreadContext::release()
void ThreadContext::stop()
{
Context::stop();
- throw StopRequest();
+ stop_hook();
+ throw ForcefulKillException();
}
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<ThreadContext*>(simix_global->maestro_process->context_.get());
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
xbt_assert(not this->is_maestro());
this->yield();
- ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
+ ThreadContext* maestro = static_cast<ThreadContext*>(simix_global->maestro_process->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<ThreadContext*>(process->context_);
+ for (smx_actor_t const& actor : simix_global->actors_to_run) {
+ XBT_DEBUG("Handling %p", actor);
+ ThreadContext* context = static_cast<ThreadContext*>(actor->context_.get());
context->release();
context->wait();
}
void ParallelThreadContext::run_all()
{
- for (smx_actor_t const& process : simix_global->process_to_run)
- static_cast<ThreadContext*>(process->context_)->release();
- for (smx_actor_t const& process : simix_global->process_to_run)
- static_cast<ThreadContext*>(process->context_)->wait();
+ for (smx_actor_t const& actor : simix_global->actors_to_run)
+ static_cast<ThreadContext*>(actor->context_.get())->release();
+ for (smx_actor_t const& actor : simix_global->actors_to_run)
+ static_cast<ThreadContext*>(actor->context_.get())->wait();
}
void ParallelThreadContext::start_hook()
