ContextBoost: move static fields where they belong to.

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 2a68c8b..dd24800 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -34,10 +34,10 @@ BoostContextFactory::BoostContextFactory()
   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);
-    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
@@ -47,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
 }
 
@@ -68,11 +68,11 @@ void BoostContextFactory::run_all()
 {
 #if HAVE_THREAD_CONTEXTS
   if (parallel_) {
-    BoostContext::threads_working_ = 0;
-    if (not BoostContext::parmap_)
-      BoostContext::parmap_ =
+    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();
@@ -84,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();
 }
@@ -93,12 +93,7 @@ void BoostContextFactory::run_all()
 
 // BoostContext
 
-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)
@@ -185,6 +180,8 @@ void BoostContext::stop()
 
 // SerialBoostContext
 
+unsigned long SerialBoostContext::process_index_;
+
 void SerialBoostContext::suspend()
 {
   /* determine the next context */
@@ -215,6 +212,11 @@ void SerialBoostContext::resume()
 
 #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();

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index b063459..067e872 100644 (file)
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -31,12 +31,19 @@ class BoostContextFactory;
 
 /** @brief Userspace context switching implementation based on Boost.Context */
 class BoostContext : public Context {
-protected: // static
-  static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
-  static std::vector<BoostContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
-  static unsigned long process_index_;
+public:
+  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  ~BoostContext() override;
+  void stop() override;
+  virtual void resume() = 0;
+
+  static void swap(BoostContext* from, BoostContext* to);
+  static BoostContext* getMaestro() { return maestro_context_; }
+  static void setMaestro(BoostContext* maestro) { maestro_context_ = maestro; }
+
+private:
+  static BoostContext* maestro_context_;
+  void* stack_ = nullptr;
 
 #if BOOST_VERSION < 105600
   boost::context::fcontext_t* fc_ = nullptr;
@@ -48,32 +55,18 @@ protected: // static
   boost::context::detail::fcontext_t fc_;
   typedef boost::context::detail::transfer_t arg_type;
 #endif
-  static void wrapper(arg_type arg);
-  static void swap(BoostContext* from, BoostContext* to);
-
 #if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
   const void* asan_stack_ = nullptr;
   size_t asan_stack_size_ = 0;
   bool asan_stop_         = false;
 #endif
 
-  void* stack_ = nullptr;
-public:
-  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  ~BoostContext() override;
-  void stop() override;
-  virtual void resume() = 0;
-
-  static BoostContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(BoostContext* maestro) { maestro_context_ = maestro; }
-
-  friend BoostContextFactory;
-
-private:
-  static BoostContext* maestro_context_;
+  static void wrapper(arg_type arg);
 };
 
 class SerialBoostContext : public BoostContext {
+  friend BoostContextFactory;
+
 public:
   SerialBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
       : BoostContext(std::move(code), cleanup_func, process)
@@ -81,10 +74,15 @@ public:
   }
   void suspend() override;
   void resume() override;
+
+private:
+  static unsigned long process_index_;
 };
 
 #if HAVE_THREAD_CONTEXTS
 class ParallelBoostContext : public BoostContext {
+  friend BoostContextFactory;
+
 public:
   ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
       : BoostContext(std::move(code), cleanup_func, process)
@@ -92,6 +90,12 @@ public:
   }
   void suspend() override;
   void resume() override;
+
+private:
+  static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
+  static std::vector<BoostContext*> workers_context_;
+  static uintptr_t threads_working_;
+  static xbt_os_thread_key_t worker_id_key_;
 };
 #endif