Change a subclass into a superclass around contexts

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

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 2edbd1d..93d7d86 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -188,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();
 }
 
@@ -266,7 +255,7 @@ void RawContext::wrapper(void* arg)
     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 e;
+    throw;
   }
   context->Context::stop();
 
@@ -306,16 +295,17 @@ 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);
+  RawContext* old = static_cast<RawContext*>(self());
+  Context::set_current(this);
+  RawContext::swap(old, this);
 }
 
 void SerialRawContext::run_all()
@@ -329,8 +319,6 @@ 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 */
 uintptr_t thread_local ParallelRawContext::worker_id_;       /* thread-specific storage for the thread id */
@@ -380,22 +368,20 @@ void ParallelRawContext::suspend()
     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()
 {
   worker_id_                         = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(SIMIX_context_self());
+  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(self());
   workers_context_[worker_id_]       = worker_context;
   XBT_DEBUG("Saving worker stack %zu", worker_id_);
-  SIMIX_context_set_current(this);
+  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.");