inline a useless function

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

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 067e872..b06ddd7 100644 (file)
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -6,8 +6,14 @@
 #ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 #define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 
-#include <boost/context/all.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#include <boost/context/fcontext.hpp>
+#else
+#include <boost/context/detail/fcontext.hpp>
+#endif
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -24,11 +30,6 @@ namespace simgrid {
 namespace kernel {
 namespace context {
 
-class BoostContext;
-class SerialBoostContext;
-class ParallelBoostContext;
-class BoostContextFactory;
-
 /** @brief Userspace context switching implementation based on Boost.Context */
 class BoostContext : public Context {
 public:
@@ -65,8 +66,6 @@ private:
 };
 
 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)
@@ -75,14 +74,14 @@ public:
   void suspend() override;
   void resume() override;
 
+  static void run_all();
+
 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)
@@ -91,10 +90,14 @@ public:
   void suspend() override;
   void resume() override;
 
+  static void initialize();
+  static void finalize();
+  static void run_all();
+
 private:
   static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
-  static std::vector<BoostContext*> workers_context_;
-  static uintptr_t threads_working_;
+  static std::vector<ParallelBoostContext*> workers_context_;
+  static std::atomic<uintptr_t> threads_working_;
   static xbt_os_thread_key_t worker_id_key_;
 };
 #endif
@@ -103,13 +106,12 @@ class BoostContextFactory : public ContextFactory {
 public:
   BoostContextFactory();
   ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t, smx_actor_t process) override;
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
   void run_all() override;
 
 private:
   bool parallel_;
 };
-
 }}} // namespace
 
 #endif