Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield

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

diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp
index 94608da..471b11f 100644 (file)
--- a/src/kernel/context/ContextUnix.hpp
+++ b/src/kernel/context/ContextUnix.hpp
@@ -8,6 +8,7 @@
 
 #include <ucontext.h> /* context relative declarations */
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -24,21 +25,24 @@ namespace simgrid {
 namespace kernel {
 namespace context {
 
-class UContext;
-class SerialUContext;
-class ParallelUContext;
-class UContextFactory;
-
 class UContext : public Context {
-private:
-  ucontext_t uc_;         /* the ucontext that executes the code */
-  char* stack_ = nullptr; /* the thread stack */
 public:
-  friend UContextFactory;
   UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
   ~UContext() override;
   void stop() override;
+  virtual void resume() = 0;
+
   static void swap(UContext* from, UContext* to) { swapcontext(&from->uc_, &to->uc_); }
+  static UContext* getMaestro() { return maestro_context_; }
+  static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
+
+private:
+  static UContext* maestro_context_;
+  void* stack_ = nullptr; /* the thread stack */
+  ucontext_t uc_;         /* the ucontext that executes the code */
+
+  static void wrapper(int, int);
+  static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
 };
 
 class SerialUContext : public UContext {
@@ -48,9 +52,15 @@ public:
   {
   }
   void suspend() override;
-  void resume();
+  void resume() override;
+
+  static void run_all();
+
+private:
+  static unsigned long process_index_;
 };
 
+#if HAVE_THREAD_CONTEXTS
 class ParallelUContext : public UContext {
 public:
   ParallelUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
@@ -58,19 +68,29 @@ public:
   {
   }
   void suspend() override;
-  void resume();
+  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<ParallelUContext*> workers_context_;
+  static std::atomic<uintptr_t> threads_working_;
+  static xbt_os_thread_key_t worker_id_key_;
 };
+#endif
 
 class UContextFactory : public ContextFactory {
 public:
-  friend UContext;
-  friend SerialUContext;
-  friend ParallelUContext;
-
   UContextFactory();
   ~UContextFactory() 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