Introduce a SwappedContextFactory to further reduce code duplication, working WIP

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

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 31b2aaf..38f0191 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -186,41 +186,23 @@ namespace context {
 
 // RawContextFactory
 
-RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel())
-{
-  RawContext::set_maestro(nullptr);
-  if (parallel_) {
-    // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1
-    ParallelRawContext::initialize();
-  }
-}
+RawContextFactory::RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
 
-RawContextFactory::~RawContextFactory()
-{
-  if (parallel_)
-    ParallelRawContext::finalize();
-}
+RawContextFactory::~RawContextFactory() = default;
 
 Context* RawContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
                                            smx_actor_t process)
 {
   if (parallel_)
-    return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process);
-  return this->new_context<RawContext>(std::move(code), cleanup_func, process);
-}
-
-void RawContextFactory::run_all()
-{
-  if (parallel_)
-    ParallelRawContext::run_all();
-  else
-    SwappedContext::run_all();
+    return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process, this);
+  return this->new_context<RawContext>(std::move(code), cleanup_func, process, this);
 }
 
 // RawContext
 
-RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process)
-    : SwappedContext(std::move(code), cleanup, process)
+RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process,
+                       SwappedContextFactory* factory)
+    : SwappedContext(std::move(code), cleanup, process, factory)
 {
    if (has_code()) {
 #if PTH_STACKGROWTH == -1
@@ -277,26 +259,6 @@ void RawContext::stop()
 
 // ParallelRawContext
 
-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 */
-std::vector<ParallelRawContext*> ParallelRawContext::workers_context_; /* space to save the worker context
-                                                                          in each thread */
-
-void ParallelRawContext::initialize()
-{
-  parmap_ = nullptr;
-  workers_context_.clear();
-  workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-}
-
-void ParallelRawContext::finalize()
-{
-  delete parmap_;
-  parmap_ = nullptr;
-  workers_context_.clear();
-}
-
 void ParallelRawContext::run_all()
 {
   threads_working_ = 0;
@@ -314,7 +276,7 @@ void ParallelRawContext::suspend()
 {
   /* determine the next context */
   boost::optional<smx_actor_t> next_work = parmap_->next();
-  ParallelRawContext* next_context;
+  SwappedContext* next_context;
   if (next_work) {
     /* there is a next process to resume */
     XBT_DEBUG("Run next process");
@@ -332,9 +294,9 @@ void ParallelRawContext::suspend()
 
 void ParallelRawContext::resume()
 {
-  worker_id_                         = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(self());
-  workers_context_[worker_id_]       = worker_context;
+  worker_id_                     = threads_working_.fetch_add(1, std::memory_order_relaxed);
+  SwappedContext* worker_context = static_cast<SwappedContext*>(self());
+  workers_context_[worker_id_]   = worker_context;
   XBT_DEBUG("Saving worker stack %zu", worker_id_);
   Context::set_current(this);
   worker_context->swap_into(this);