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

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 2037673a52..17a3df7340 100644
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -34,13 +34,12 @@ ThreadContextFactory::~ThreadContextFactory()
     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, smx_actor_t actor, bool maestro)
 {
   if (parallel_)
-    return this->new_context<ParallelThreadContext>(std::move(code), cleanup, actor, maestro);
+    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()
@@ -56,8 +55,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, smx_actor_t 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,9 +80,8 @@ ThreadContext::~ThreadContext()
   }
 }
 
-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()
@@ -178,7 +179,7 @@ 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_);
     context->release();
@@ -203,9 +204,9 @@ void ParallelThreadContext::finalize()
 
 void ParallelThreadContext::run_all()
 {
-  for (smx_actor_t const& actor : simix_global->process_to_run)
+  for (smx_actor_t const& actor : simix_global->actors_to_run)
     static_cast<ThreadContext*>(actor->context_)->release();
-  for (smx_actor_t const& actor : simix_global->process_to_run)
+  for (smx_actor_t const& actor : simix_global->actors_to_run)
     static_cast<ThreadContext*>(actor->context_)->wait();
 }