X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa9cfa5743045b941f3afca368462ea2be992a5f..cb5c0fb6bd81952456a54789b6ad1d570067ae80:/src/kernel/context/ContextSwapped.hpp?ds=sidebyside

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 606dd447ce..cabea51f29 100644
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -1,14 +1,14 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2020. 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. */
 
-#ifndef SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
-#define SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_SWAPPED_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_SWAPPED_CONTEXT_HPP
 
 #include "src/kernel/context/Context.hpp"
 
-#include <vector>
+#include <memory>
 
 namespace simgrid {
 namespace kernel {
@@ -18,45 +18,67 @@ class SwappedContext;
 class SwappedContextFactory : public ContextFactory {
   friend SwappedContext; // Reads whether we are in parallel mode
 public:
-  explicit SwappedContextFactory(std::string name);
-  ~SwappedContextFactory() override;
+  SwappedContextFactory()                             = default;
+  SwappedContextFactory(const SwappedContextFactory&) = delete;
+  SwappedContextFactory& operator=(const SwappedContextFactory&) = delete;
   void run_all() override;
 
 private:
-  bool parallel_;
+  /* For the sequential execution */
+  unsigned long process_index_     = 0;       // next actor to execute
+  SwappedContext* maestro_context_ = nullptr; // save maestro's context
 
-  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 */
+  /* For the parallel execution, will be created lazily with the right parameters if needed (ie, in parallel) */
+  std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_{nullptr};
 };
 
 class SwappedContext : public Context {
 public:
-  SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
-                 SwappedContextFactory* factory);
+  SwappedContext(std::function<void()>&& code, smx_actor_t get_actor, SwappedContextFactory* factory);
+  SwappedContext(const SwappedContext&) = delete;
+  SwappedContext& operator=(const SwappedContext&) = delete;
   virtual ~SwappedContext();
 
   void suspend() override;
   virtual void resume();
-  void stop() override;
+  XBT_ATTRIB_NORETURN void stop() override;
 
   virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  void set_maestro(SwappedContext* ctx);
+  unsigned char* get_stack() const { return stack_; }
+  // Return the address for the bottom of the stack.  Depending on the stack direction it may be the lower or higher
+  // address
+  unsigned char* get_stack_bottom() const { return PTH_STACKGROWTH == -1 ? stack_ + smx_context_stack_size : stack_; }
 
-  // FIXME: Killme
-  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
 
 protected:
-  void* stack_ = nullptr; /* the thread stack */
+  // With ASan, after a context switch, check that the originating context is the expected one (see BoostContext)
+  void verify_previous_context(const SwappedContext* context) const;
 
 private:
-  SwappedContextFactory* factory_; // for sequential and parallel run_all()
+  static thread_local SwappedContext* worker_context_;
+
+  unsigned char* stack_ = nullptr; // the thread stack
+  SwappedContextFactory& factory_; // for sequential and parallel run_all()
+
+#if HAVE_VALGRIND_H
+  unsigned int valgrind_stack_id_;
+#endif
 };
 
+inline void SwappedContext::verify_previous_context(XBT_ATTRIB_UNUSED const SwappedContext* context) const
+{
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+  xbt_assert(this->asan_ctx_ == context);
+#endif
+}
+
 } // namespace context
 } // namespace kernel
 } // namespace simgrid