-/* 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. */
// 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<void()> code, void_pfn_smxprocess_t cleanup,
- smx_actor_t actor, bool maestro)
+ThreadContext* ThreadContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
{
- if (parallel_)
- return this->new_context<ParallelThreadContext>(std::move(code), cleanup, actor, maestro);
+ if (SIMIX_context_is_parallel())
+ return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
else
- return this->new_context<SerialThreadContext>(std::move(code), cleanup, actor, maestro);
+ return this->new_context<SerialThreadContext>(std::move(code), actor, maestro);
}
void ThreadContextFactory::run_all()
{
- if (parallel_) {
+ if (SIMIX_context_is_parallel()) {
// Parallel execution
ParallelThreadContext::run_all();
} else {
// 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, actor::ActorImpl* actor, bool maestro)
+ : AttachContext(std::move(code), actor), is_maestro_(maestro)
{
/* If the user provided a function for the actor then use it */
if (has_code()) {
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<ThreadContext*>(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();
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();
#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()
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_;
+ auto* maestro = static_cast<ThreadContext*>(simix_global->maestro_->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_;
+ auto* maestro = static_cast<ThreadContext*>(simix_global->maestro_->context_.get());
maestro->end_.acquire();
Context::set_current(nullptr);
void SerialThreadContext::run_all()
{
- for (smx_actor_t const& actor : simix_global->process_to_run) {
+ for (smx_actor_t const& actor : simix_global->actors_to_run) {
XBT_DEBUG("Handling %p", actor);
- ThreadContext* context = static_cast<ThreadContext*>(actor->context_);
+ auto* context = static_cast<ThreadContext*>(actor->context_.get());
context->release();
context->wait();
}
void ParallelThreadContext::run_all()
{
- for (smx_actor_t const& actor : simix_global->process_to_run)
- static_cast<ThreadContext*>(actor->context_)->release();
- for (smx_actor_t const& actor : simix_global->process_to_run)
- static_cast<ThreadContext*>(actor->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()
XBT_VERB("Activating thread context factory");
return new ThreadContextFactory();
}
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
