X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3..7e42dd535dfc0d68de20fba4b9fc5e480b56c74b:/src/kernel/context/ContextRaw.cpp

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index c522d8224d..a0c065fcfa 100644
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -6,6 +6,7 @@
 #include "ContextRaw.hpp"
 #include "context_private.hpp"
 #include "mc/mc.h"
+#include "simgrid/Exception.hpp"
 #include "src/simix/smx_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@ -187,43 +188,32 @@ namespace context {
 
 RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  RawContext::setMaestro(nullptr);
+  RawContext::set_maestro(nullptr);
   if (parallel_) {
-#if HAVE_THREAD_CONTEXTS
     // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1
     ParallelRawContext::initialize();
-#else
-    xbt_die("You asked for a parallel execution, but you don't have any threads.");
-#endif
   }
 }
 
 RawContextFactory::~RawContextFactory()
 {
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
     ParallelRawContext::finalize();
-#endif
 }
 
 Context* RawContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
                                            smx_actor_t process)
 {
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
     return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process);
-#endif
-
   return this->new_context<SerialRawContext>(std::move(code), cleanup_func, process);
 }
 
 void RawContextFactory::run_all()
 {
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
     ParallelRawContext::run_all();
   else
-#endif
     SerialRawContext::run_all();
 }
 
@@ -258,14 +248,18 @@ RawContext::~RawContext()
 void RawContext::wrapper(void* arg)
 {
   RawContext* context = static_cast<RawContext*>(arg);
-  ASAN_FINISH_SWITCH(nullptr, &context_->asan_ctx_->asan_stack_, &context_->asan_ctx_->asan_stack_size_);
+  ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
   try {
     (*context)();
-    context->Context::stop();
   } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
+  } catch (simgrid::Exception const& e) {
+    XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+    throw;
   }
-  ASAN_ONLY(context_->asan_stop_ = true);
+  context->Context::stop();
+
+  ASAN_ONLY(context->asan_stop_ = true);
   context->suspend();
 }
 
@@ -301,16 +295,16 @@ void SerialRawContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialRawContext*>(RawContext::getMaestro());
+    next_context = static_cast<SerialRawContext*>(RawContext::get_maestro());
   }
-  SIMIX_context_set_current(next_context);
+  Context::set_current(next_context);
   RawContext::swap(this, next_context);
 }
 
 void SerialRawContext::resume()
 {
-  SIMIX_context_set_current(this);
-  RawContext::swap(RawContext::getMaestro(), this);
+  Context::set_current(this);
+  RawContext::swap(RawContext::get_maestro(), this);
 }
 
 void SerialRawContext::run_all()
@@ -324,11 +318,9 @@ void SerialRawContext::run_all()
 
 // ParallelRawContext
 
-#if HAVE_THREAD_CONTEXTS
-
 simgrid::xbt::Parmap<smx_actor_t>* ParallelRawContext::parmap_;
 std::atomic<uintptr_t> ParallelRawContext::threads_working_; /* number of threads that have started their work */
-xbt_os_thread_key_t ParallelRawContext::worker_id_key_; /* thread-specific storage for the thread id */
+uintptr_t thread_local ParallelRawContext::worker_id_;       /* thread-specific storage for the thread id */
 std::vector<ParallelRawContext*> ParallelRawContext::workers_context_; /* space to save the worker context
                                                                           in each thread */
 
@@ -337,7 +329,6 @@ void ParallelRawContext::initialize()
   parmap_ = nullptr;
   workers_context_.clear();
   workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-  xbt_os_thread_key_create(&worker_id_key_);
 }
 
 void ParallelRawContext::finalize()
@@ -345,7 +336,6 @@ void ParallelRawContext::finalize()
   delete parmap_;
   parmap_ = nullptr;
   workers_context_.clear();
-  xbt_os_thread_key_destroy(worker_id_key_);
 }
 
 void ParallelRawContext::run_all()
@@ -373,28 +363,24 @@ void ParallelRawContext::suspend()
   } else {
     /* all processes were run, go to the barrier */
     XBT_DEBUG("No more processes to run");
-    uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
-    next_context        = workers_context_[worker_id];
-    XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, threads_working_.load());
+    next_context = workers_context_[worker_id_];
+    XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load());
   }
 
-  SIMIX_context_set_current(next_context);
+  Context::set_current(next_context);
   RawContext::swap(this, next_context);
 }
 
 void ParallelRawContext::resume()
 {
-  uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
-  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(SIMIX_context_self());
-  workers_context_[worker_id]        = worker_context;
-  XBT_DEBUG("Saving worker stack %zu", worker_id);
-  SIMIX_context_set_current(this);
+  worker_id_                         = threads_working_.fetch_add(1, std::memory_order_relaxed);
+  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(self());
+  workers_context_[worker_id_]       = worker_context;
+  XBT_DEBUG("Saving worker stack %zu", worker_id_);
+  Context::set_current(this);
   RawContext::swap(worker_context, this);
 }
 
-#endif
-
 ContextFactory* raw_factory()
 {
   XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");