Change a subclass into a superclass around contexts

[simgrid.git] / src / kernel / context / ContextBoost.cpp

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index bff914d..e9ea749 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -5,6 +5,7 @@
 
 #include "ContextBoost.hpp"
 #include "context_private.hpp"
+#include "simgrid/Exception.hpp"
 #include "src/simix/smx_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@ -18,42 +19,30 @@ namespace context {
 BoostContextFactory::BoostContextFactory()
     : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  BoostContext::setMaestro(nullptr);
-  if (parallel_) {
-#if HAVE_THREAD_CONTEXTS
+  BoostContext::set_maestro(nullptr);
+  if (parallel_)
     ParallelBoostContext::initialize();
-#else
-    xbt_die("No thread support for parallel context execution");
-#endif
-  }
 }
 
 BoostContextFactory::~BoostContextFactory()
 {
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
     ParallelBoostContext::finalize();
-#endif
 }
 
 smx_context_t BoostContextFactory::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<ParallelBoostContext>(std::move(code), cleanup_func, process);
-#endif
-
   return this->new_context<SerialBoostContext>(std::move(code), cleanup_func, process);
 }
 
 void BoostContextFactory::run_all()
 {
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
     ParallelBoostContext::run_all();
   else
-#endif
     SerialBoostContext::run_all();
 }
 
@@ -113,10 +102,13 @@ void BoostContext::wrapper(BoostContext::arg_type arg)
 #endif
   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;
   }
+  context->Context::stop();
   ASAN_ONLY(context->asan_stop_ = true);
   context->suspend();
 }
@@ -163,16 +155,17 @@ void SerialBoostContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
+    next_context = static_cast<SerialBoostContext*>(BoostContext::get_maestro());
   }
-  SIMIX_context_set_current(next_context);
+  Context::set_current(next_context);
   BoostContext::swap(this, next_context);
 }
 
 void SerialBoostContext::resume()
 {
-  SIMIX_context_set_current(this);
-  BoostContext::swap(BoostContext::getMaestro(), this);
+  BoostContext* old = static_cast<BoostContext*>(self());
+  Context::set_current(this);
+  BoostContext::swap(old, this);
 }
 
 void SerialBoostContext::run_all()
@@ -187,11 +180,9 @@ void SerialBoostContext::run_all()
 
 // ParallelBoostContext
 
-#if HAVE_THREAD_CONTEXTS
-
 simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
 std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
-xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
+thread_local uintptr_t ParallelBoostContext::worker_id_;
 std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
 
 void ParallelBoostContext::initialize()
@@ -199,7 +190,6 @@ void ParallelBoostContext::initialize()
   parmap_ = nullptr;
   workers_context_.clear();
   workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-  xbt_os_thread_key_create(&worker_id_key_);
 }
 
 void ParallelBoostContext::finalize()
@@ -207,7 +197,6 @@ void ParallelBoostContext::finalize()
   delete parmap_;
   parmap_ = nullptr;
   workers_context_.clear();
-  xbt_os_thread_key_destroy(worker_id_key_);
 }
 
 void ParallelBoostContext::run_all()
@@ -232,27 +221,24 @@ void ParallelBoostContext::suspend()
     next_context = static_cast<ParallelBoostContext*>(next_work.get()->context_);
   } else {
     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];
+    next_context = workers_context_[worker_id_];
   }
 
-  SIMIX_context_set_current(next_context);
+  Context::set_current(next_context);
   BoostContext::swap(this, next_context);
 }
 
 void ParallelBoostContext::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));
+  worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
 
-  ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
-  workers_context_[worker_id]          = worker_context;
+  ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(self());
+  workers_context_[worker_id_]         = worker_context;
 
-  SIMIX_context_set_current(this);
+  Context::set_current(this);
   BoostContext::swap(worker_context, this);
 }
 
-#endif
 
 XBT_PRIVATE ContextFactory* boost_factory()
 {