X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d5c6aed22b8ae1c8a73cd04d8ab800322d177bf..2d37e348a09783cda723c7019640ee69de168324:/src/kernel/context/ContextSwapped.hpp

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 8b5188d941..aba97d5b95 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. */
@@ -6,31 +6,59 @@
 #ifndef SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
 #define SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
 
-#include "Context.hpp"
+#include "src/kernel/context/Context.hpp"
+
+#include <vector>
 
 namespace simgrid {
 namespace kernel {
 namespace context {
+class SwappedContext;
+
+class SwappedContextFactory : public ContextFactory {
+  friend SwappedContext; // Reads whether we are in parallel mode
+public:
+  SwappedContextFactory();
+  ~SwappedContextFactory() override;
+  void run_all() override;
+
+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_{0};    /* number of threads that have started their work */
+};
 
 class SwappedContext : public Context {
 public:
-  SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : Context(std::move(code), cleanup_func, process)
-  {
-  }
-  virtual void suspend();
+  SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t get_actor,
+                 SwappedContextFactory* factory);
+  virtual ~SwappedContext();
+
+  void suspend() override;
   virtual void resume();
+  void stop() override;
 
-  static void run_all();
+  virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  virtual void swap_into(SwappedContext* to) = 0;
+  void* get_stack();
 
-  static SwappedContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+  static thread_local uintptr_t worker_id_;
+
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+  const void* asan_stack_   = nullptr;
+  size_t asan_stack_size_   = 0;
+  SwappedContext* asan_ctx_ = nullptr;
+  bool asan_stop_           = false;
+#endif
 
 private:
-  static unsigned long process_index_;
-  static SwappedContext* maestro_context_;
+  void* stack_ = nullptr;                /* the thread stack */
+  SwappedContextFactory* const factory_; // for sequential and parallel run_all()
 };
 
 } // namespace context