Cosmetics in contexts

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

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index 6d79a94..63fe3b7 100644 (file)
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -14,6 +14,8 @@
 #include <xbt/parmap.hpp>
 #include <xbt/xbt_os_thread.h>
 
+#include "src/kernel/context/ContextSwapped.hpp"
+
 namespace simgrid {
 namespace kernel {
 namespace context {
@@ -23,20 +25,15 @@ namespace context {
   * The main difference to the System V context is that Raw Contexts are much faster because they don't
   * preserve the signal mask when switching. This saves a system call (at least on Linux) on each context switch.
   */
-class RawContext : public Context {
+class RawContext : public SwappedContext {
 public:
-  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+             SwappedContextFactory* factory);
   ~RawContext() override;
-  void stop() override;
-  virtual void resume() = 0;
 
-  static void swap(RawContext* from, RawContext* to);
-  static RawContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(RawContext* maestro) { maestro_context_ = maestro; }
+  void swap_into(SwappedContext* to) override;
 
 private:
-  static RawContext* maestro_context_;
-  void* stack_ = nullptr;
   /** pointer to top the stack stack */
   void* stack_top_ = nullptr;
 
@@ -50,52 +47,22 @@ private:
   static void wrapper(void* arg);
 };
 
-class SerialRawContext : public RawContext {
-public:
-  SerialRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : RawContext(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 ParallelRawContext : public RawContext {
 public:
-  ParallelRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : RawContext(std::move(code), cleanup_func, process)
+  ParallelRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+                     SwappedContextFactory* factory)
+      : RawContext(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<ParallelRawContext*> workers_context_;
-  static std::atomic<uintptr_t> threads_working_;
-  static uintptr_t thread_local worker_id_;
 };
-#endif
 
-class RawContextFactory : public ContextFactory {
+class RawContextFactory : public SwappedContextFactory {
 public:
-  RawContextFactory();
-  ~RawContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
-  void run_all() override;
+  RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
 
-private:
-  bool parallel_;
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
 };
 }}} // namespace