X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3580c1f2e5172b721449d0e79c72241bd012152a..836d550dd0e6a85294e877cf7129b865bc0cb561:/src/kernel/context/ContextSwapped.hpp

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 46c0b0946d..41a174720c 100644
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -18,12 +18,19 @@ class SwappedContext;
 class SwappedContextFactory : public ContextFactory {
   friend SwappedContext; // Reads whether we are in parallel mode
 public:
-  SwappedContextFactory(std::string name);
+  explicit SwappedContextFactory(std::string name);
   ~SwappedContextFactory() override;
   void run_all() override;
 
-protected: // FIXME temporary internal exposure
+private:
   bool parallel_;
+
+  unsigned long process_index_ = 0; // Next actor to execute during sequential run_all()
+
+  /* For the parallel execution */
+  simgrid::xbt::Parmap<smx_actor_t>* parmap_;
+  std::vector<SwappedContext*> workers_context_; /* space to save the worker's context in each thread */
+  std::atomic<uintptr_t> threads_working_;       /* number of threads that have started their work */
 };
 
 class SwappedContext : public Context {
@@ -32,32 +39,22 @@ public:
                  SwappedContextFactory* factory);
   virtual ~SwappedContext();
 
-  static void initialize(bool parallel); // Initialize the module, using the options
-  static void finalize();   // Finalize the module
-
-  virtual void suspend();
+  void suspend() override;
   virtual void resume();
+  void stop() override;
 
-  virtual void swap_into(SwappedContext* to) = 0; // Defined in subclasses
-
-  static SwappedContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+  virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  static unsigned long process_index_; // FIXME killme
+  void set_maestro(SwappedContext* ctx) { factory_->workers_context_[0] = ctx; }
 
-  /* For the parallel execution */
-  static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
-  static std::vector<SwappedContext*> workers_context_;
-  static std::atomic<uintptr_t> threads_working_;
+  // FIXME: Killme
   static thread_local uintptr_t worker_id_;
 
 protected:
   void* stack_ = nullptr; /* the thread stack */
 
 private:
-  static SwappedContext* maestro_context_;
-  /* For sequential and parallel run_all() */
-  SwappedContextFactory* factory_;
+  SwappedContextFactory* factory_; // for sequential and parallel run_all()
 };
 
 } // namespace context