ContextBoost: move static fields where they belong to.

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

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 6a8beb7..dd24800 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -29,16 +29,15 @@ namespace context {
 // BoostContextFactory
 
 BoostContextFactory::BoostContextFactory()
-  : ContextFactory("BoostContextFactory")
+    : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel())
 {
-  BoostContext::parallel_ = SIMIX_context_is_parallel();
-  if (BoostContext::parallel_) {
+  BoostContext::setMaestro(nullptr);
+  if (parallel_) {
 #if HAVE_THREAD_CONTEXTS
-    BoostContext::parmap_ = nullptr;
-    BoostContext::workers_context_.clear();
-    BoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-    BoostContext::maestro_context_ = nullptr;
-    xbt_os_thread_key_create(&BoostContext::worker_id_key_);
+    ParallelBoostContext::parmap_ = nullptr;
+    ParallelBoostContext::workers_context_.clear();
+    ParallelBoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
+    xbt_os_thread_key_create(&ParallelBoostContext::worker_id_key_);
 #else
     xbt_die("No thread support for parallel context execution");
 #endif
@@ -48,9 +47,9 @@ BoostContextFactory::BoostContextFactory()
 BoostContextFactory::~BoostContextFactory()
 {
 #if HAVE_THREAD_CONTEXTS
-  delete BoostContext::parmap_;
-  BoostContext::parmap_ = nullptr;
-  BoostContext::workers_context_.clear();
+  delete ParallelBoostContext::parmap_;
+  ParallelBoostContext::parmap_ = nullptr;
+  ParallelBoostContext::workers_context_.clear();
 #endif
 }
 
@@ -58,7 +57,7 @@ smx_context_t BoostContextFactory::create_context(std::function<void()> code, vo
                                                   smx_actor_t process)
 {
 #if HAVE_THREAD_CONTEXTS
-  if (BoostContext::parallel_)
+  if (parallel_)
     return this->new_context<ParallelBoostContext>(std::move(code), cleanup_func, process);
 #endif
 
@@ -68,12 +67,12 @@ smx_context_t BoostContextFactory::create_context(std::function<void()> code, vo
 void BoostContextFactory::run_all()
 {
 #if HAVE_THREAD_CONTEXTS
-  if (BoostContext::parallel_) {
-    BoostContext::threads_working_ = 0;
-    if (not BoostContext::parmap_)
-      BoostContext::parmap_ =
+  if (parallel_) {
+    ParallelBoostContext::threads_working_ = 0;
+    if (not ParallelBoostContext::parmap_)
+      ParallelBoostContext::parmap_ =
           new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
-    BoostContext::parmap_->apply(
+    ParallelBoostContext::parmap_->apply(
         [](smx_actor_t process) {
           BoostContext* context = static_cast<BoostContext*>(process->context);
           return context->resume();
@@ -85,8 +84,8 @@ void BoostContextFactory::run_all()
 
   if (simix_global->process_to_run.empty())
     return;
-  smx_actor_t first_process    = simix_global->process_to_run.front();
-  BoostContext::process_index_ = 1;
+  smx_actor_t first_process          = simix_global->process_to_run.front();
+  SerialBoostContext::process_index_ = 1;
   /* execute the first process */
   static_cast<BoostContext*>(first_process->context)->resume();
 }
@@ -94,13 +93,7 @@ void BoostContextFactory::run_all()
 
 // BoostContext
 
-bool BoostContext::parallel_                             = false;
-simgrid::xbt::Parmap<smx_actor_t>* BoostContext::parmap_ = nullptr;
-uintptr_t BoostContext::threads_working_                 = 0;
-xbt_os_thread_key_t BoostContext::worker_id_key_;
-unsigned long BoostContext::process_index_   = 0;
 BoostContext* BoostContext::maestro_context_ = nullptr;
-std::vector<BoostContext*> BoostContext::workers_context_;
 
 BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
     : Context(std::move(code), cleanup_func, process)
@@ -187,6 +180,8 @@ void BoostContext::stop()
 
 // SerialBoostContext
 
+unsigned long SerialBoostContext::process_index_;
+
 void SerialBoostContext::suspend()
 {
   /* determine the next context */
@@ -201,7 +196,7 @@ void SerialBoostContext::suspend()
   } else {
     /* all processes were run, return to maestro */
     XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialBoostContext*>(maestro_context_);
+    next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
   }
   SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
   BoostContext::swap(this, next_context);
@@ -210,13 +205,18 @@ void SerialBoostContext::suspend()
 void SerialBoostContext::resume()
 {
   SIMIX_context_set_current(this);
-  BoostContext::swap(maestro_context_, this);
+  BoostContext::swap(BoostContext::getMaestro(), this);
 }
 
 // ParallelBoostContext
 
 #if HAVE_THREAD_CONTEXTS
 
+simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_ = nullptr;
+uintptr_t ParallelBoostContext::threads_working_                 = 0;
+xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
+std::vector<BoostContext*> ParallelBoostContext::workers_context_;
+
 void ParallelBoostContext::suspend()
 {
   boost::optional<smx_actor_t> next_work = parmap_->next();