X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f6cb16e7427d1583ab346042e2f27f7cd95f2b8..15f9e0adbd11d2a0736440004a2f71ef9cfccab8:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 7b3a58e8e2..781cdd7a5a 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -22,29 +22,24 @@
 #include <xbt/parmap.hpp>
 #include <xbt/xbt_os_thread.h>
 
-#include "Context.hpp"
 #include "src/internal_config.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/kernel/context/ContextSwapped.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace context {
 
 /** @brief Userspace context switching implementation based on Boost.Context */
-class BoostContext : public Context {
+class BoostContext : public SwappedContext {
 public:
-  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+               SwappedContextFactory* factory);
   ~BoostContext() override;
-  void stop() override;
-  virtual void resume() = 0;
 
-  static void swap(BoostContext* from, BoostContext* to);
-  static BoostContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(BoostContext* maestro) { maestro_context_ = maestro; }
+  void swap_into(SwappedContext* to) override;
 
 private:
-  static BoostContext* maestro_context_;
-  void* stack_ = nullptr;
-
 #if BOOST_VERSION < 105600
   boost::context::fcontext_t* fc_ = nullptr;
   typedef intptr_t arg_type;
@@ -65,52 +60,22 @@ private:
   static void wrapper(arg_type arg);
 };
 
-class SerialBoostContext : public BoostContext {
-public:
-  SerialBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : BoostContext(std::move(code), cleanup_func, process)
-  {
-  }
-  void suspend() override;
-  void resume() override;
-
-  static void run_all();
-
-private:
-  static unsigned long process_index_;
-};
-
-#if HAVE_THREAD_CONTEXTS
 class ParallelBoostContext : public BoostContext {
 public:
-  ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : BoostContext(std::move(code), cleanup_func, process)
+  ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+                       SwappedContextFactory* factory)
+      : BoostContext(std::move(code), cleanup_func, process, factory)
   {
   }
   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<ParallelBoostContext*> workers_context_;
-  static std::atomic<uintptr_t> threads_working_;
-  static thread_local uintptr_t worker_id_;
 };
-#endif
 
-class BoostContextFactory : public ContextFactory {
+class BoostContextFactory : public SwappedContextFactory {
 public:
-  BoostContextFactory();
-  ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
-  void run_all() override;
+  BoostContextFactory() : SwappedContextFactory("BoostContextFactory") {}
 
-private:
-  bool parallel_;
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
 };
 }}} // namespace