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

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index d22c7aa318..3e2b0668bd 100644
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -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 <functional>
 #include <utility>
@@ -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<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()
@@ -58,14 +55,14 @@ 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()) {
-    /* 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();
   }
 
@@ -77,13 +74,14 @@ ThreadContext::ThreadContext(std::function<void()> 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_;
+  }
 }
 
-void *ThreadContext::wrapper(void *param)
+void ThreadContext::wrapper(ThreadContext* context)
 {
-  ThreadContext* context = static_cast<ThreadContext*>(param);
   Context::set_current(context);
 
 #ifndef WIN32
@@ -100,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());
     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();
 
@@ -117,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()
@@ -145,7 +145,8 @@ void ThreadContext::yield()
 void ThreadContext::stop()
 {
   Context::stop();
-  throw StopRequest();
+  stop_hook();
+  throw ForcefulKillException();
 }
 
 void ThreadContext::suspend()
@@ -157,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<ThreadContext*>(simix_global->maestro_process->context_.get());
   maestro->begin_.release();
   xbt_assert(not this->is_maestro());
   this->start();
@@ -168,7 +169,7 @@ void ThreadContext::attach_stop()
   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();
 
   Context::set_current(nullptr);
@@ -178,9 +179,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<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();
   }
@@ -203,10 +204,10 @@ void ParallelThreadContext::finalize()
 
 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()