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

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 0dbc048335..02b9bca7ad 100644
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2017. 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. */
@@ -50,18 +49,16 @@ ThreadContextFactory::~ThreadContextFactory()
 
 ThreadContext* ThreadContextFactory::create_context(
     std::function<void()> code,
-    void_pfn_smxprocess_t cleanup, smx_process_t process)
+    void_pfn_smxprocess_t cleanup, smx_actor_t process)
 {
-  return this->new_context<ThreadContext>(std::move(code), cleanup, process, !code);
+  return this->new_context<ThreadContext>(std::move(code), cleanup, process, not code);
 }
 
 void ThreadContextFactory::run_all()
 {
   if (smx_ctx_thread_sem == nullptr) {
     // Serial execution
-    smx_process_t process;
-    unsigned int cursor;
-    xbt_dynar_foreach(simix_global->process_to_run, cursor, process) {
+    for (smx_actor_t const& process : simix_global->process_to_run) {
       XBT_DEBUG("Handling %p",process);
       ThreadContext* context = static_cast<ThreadContext*>(process->context);
       xbt_os_sem_release(context->begin_);
@@ -69,12 +66,10 @@ void ThreadContextFactory::run_all()
     }
   } else {
     // Parallel execution
-    unsigned int index;
-    smx_process_t process;
-    xbt_dynar_foreach(simix_global->process_to_run, index, process)
+    for (smx_actor_t const& process : simix_global->process_to_run)
       xbt_os_sem_release(static_cast<ThreadContext*>(process->context)->begin_);
-    xbt_dynar_foreach(simix_global->process_to_run, index, process)
-       xbt_os_sem_acquire(static_cast<ThreadContext*>(process->context)->end_);
+    for (smx_actor_t const& process : simix_global->process_to_run)
+      xbt_os_sem_acquire(static_cast<ThreadContext*>(process->context)->end_);
   }
 }
 
@@ -83,22 +78,23 @@ ThreadContext* ThreadContextFactory::self()
   return static_cast<ThreadContext*>(xbt_os_thread_get_extra_data());
 }
 
-ThreadContext* ThreadContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process)
+ThreadContext* ThreadContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
 {
   return this->new_context<ThreadContext>(
     std::function<void()>(), cleanup_func, process, false);
 }
 
-ThreadContext* ThreadContextFactory::create_maestro(std::function<void()> code, smx_process_t process)
+ThreadContext* ThreadContextFactory::create_maestro(std::function<void()> code, smx_actor_t process)
 {
     return this->new_context<ThreadContext>(std::move(code), nullptr, process, true);
 }
 
 ThreadContext::ThreadContext(std::function<void()> code,
-    void_pfn_smxprocess_t cleanup, smx_process_t process, bool maestro)
+    void_pfn_smxprocess_t cleanup, smx_actor_t process, bool maestro)
   : AttachContext(std::move(code), cleanup, process)
 {
-  // We do not need the semaphores when maestro is in main, but we create them anyway for simplicity wrt the case where maestro is externalized
+  // We do not need the semaphores when maestro is in main,
+  // but creating them anyway simplifies things when maestro is externalized
   this->begin_ = xbt_os_sem_init(0);
   this->end_ = xbt_os_sem_init(0);
 
@@ -114,7 +110,7 @@ ThreadContext::ThreadContext(std::function<void()> code,
     * name, but now the name is stored at SIMIX level, so we pass a null  */
     this->thread_ =
       xbt_os_thread_create(nullptr,
-        maestro ? ThreadContext::maestro_wrapper : ThreadContext::wrapper,
+        maestro ? &ThreadContext::maestro_wrapper : &ThreadContext::wrapper,
         this, this);
     /* wait the starting of the newly created process */
     xbt_os_sem_acquire(this->end_);
@@ -183,6 +179,10 @@ void *ThreadContext::maestro_wrapper(void *param)
   // Tell main that we have finished:
   xbt_os_sem_release(context->end_);
 
+#ifndef WIN32
+  stack.ss_flags = SS_DISABLE;
+  sigaltstack(&stack, nullptr);
+#endif
   return nullptr;
 }
 
@@ -202,6 +202,11 @@ void ThreadContext::stop()
   // Signal to the maestro that it has finished:
   xbt_os_sem_release(this->end_);
 
+#ifndef WIN32
+  stack_t stack  = {};
+  stack.ss_flags = SS_DISABLE;
+  sigaltstack(&stack, nullptr);
+#endif
   xbt_os_thread_exit(nullptr);
 }