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

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 2794f4a140..8ff75d5626 100644
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,15 +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:
+private:
   bool parallel_;
 
-private:
   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_{0};    /* number of threads that have started their work */
 };
 
 class SwappedContext : public Context {
@@ -35,31 +39,21 @@ public:
                  SwappedContextFactory* factory);
   virtual ~SwappedContext();
 
-  static void initialize(bool parallel); // Initialize the module, using the options
-  static void finalize();   // Finalize the module
-
   void suspend() override;
   virtual void resume();
   void stop() override;
 
-  virtual void swap_into(SwappedContext* to) = 0; // Defined in subclasses
+  virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  static SwappedContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+  void set_maestro(SwappedContext* ctx);
+  void* get_stack();
 
-  /* For the parallel execution */ // FIXME killme
-  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_;
+  void* stack_ = nullptr;                /* the thread stack */
+  SwappedContextFactory* const factory_; // for sequential and parallel run_all()
 };
 
 } // namespace context