X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a57f4208147d6350deb00455826fbf8fd6d2f22e..cefad23a9d9a13805bb7b6017d8d9e0585d639d5:/src/kernel/context/ContextThread.cpp

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index cc2529a60a..6be2b09da8 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-2020. 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. */
@@ -22,30 +22,31 @@ namespace context {
 
 // ThreadContextFactory
 
-ThreadContextFactory::ThreadContextFactory() : ContextFactory(), 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 {
@@ -56,8 +57,8 @@ 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, 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()) {
@@ -81,18 +82,12 @@ ThreadContext::~ThreadContext()
   }
 }
 
-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();
@@ -100,25 +95,25 @@ void *ThreadContext::wrapper(void *param)
 
   try {
     (*context)();
-    if (not context->is_maestro()) // Just in case somebody detached maestro
+    if (not context->is_maestro()) { // Just in case somebody detached maestro
       context->Context::stop();
-  } catch (StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest in Thread::wrapper");
-    xbt_assert(not context->is_maestro(), "Maestro shall not receive StopRequests, even when detached.");
+      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;
   }
   // 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
   XBT_DEBUG("Terminating");
   Context::set_current(nullptr);
-  return nullptr;
 }
 
 void ThreadContext::release()
@@ -146,7 +141,8 @@ void ThreadContext::yield()
 void ThreadContext::stop()
 {
   Context::stop();
-  throw StopRequest();
+  stop_hook();
+  throw ForcefulKillException();
 }
 
 void ThreadContext::suspend()
@@ -158,7 +154,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<ThreadContext*>(simix_global->maestro_->context_.get());
   maestro->begin_.release();
   xbt_assert(not this->is_maestro());
   this->start();
@@ -169,7 +165,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<ThreadContext*>(simix_global->maestro_->context_.get());
   maestro->end_.acquire();
 
   Context::set_current(nullptr);
@@ -179,9 +175,9 @@ void ThreadContext::attach_stop()
 
 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();
   }
@@ -204,10 +200,10 @@ void ParallelThreadContext::finalize()
 
 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()
@@ -227,4 +223,6 @@ XBT_PRIVATE ContextFactory* thread_factory()
   XBT_VERB("Activating thread context factory");
   return new ThreadContextFactory();
 }
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid