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

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 9c15dc6483..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. */
@@ -13,37 +13,52 @@
 namespace simgrid {
 namespace kernel {
 namespace context {
+class SwappedContext;
 
-class SwappedContext : public Context {
+class SwappedContextFactory : public ContextFactory {
+  friend SwappedContext; // Reads whether we are in parallel mode
 public:
-  SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  virtual ~SwappedContext();
+  SwappedContextFactory();
+  ~SwappedContextFactory() override;
+  void run_all() override;
 
-  static void initialize(); // Initialize the module, using the options
-  static void finalize();   // Finalize the module
+private:
+  bool parallel_;
 
-  virtual void suspend();
-  virtual void resume();
+  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 */
+};
 
-  static void run_all();
+class SwappedContext : public Context {
+public:
+  SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t get_actor,
+                 SwappedContextFactory* factory);
+  virtual ~SwappedContext();
 
-  virtual void swap_into(SwappedContext* to) = 0; // Defined in subclasses
+  void suspend() override;
+  virtual void resume();
+  void stop() override;
 
-  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
 
-protected:
-  void* stack_ = nullptr; /* the thread stack */
+  void* get_stack();
 
-  /* 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_;
   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