X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c93f29cd7a1453e10d8635f11e48cf0d537a83a2..7e42dd535dfc0d68de20fba4b9fc5e480b56c74b:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index a816fe62ba..fb60021fd9 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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,8 +6,14 @@
 #ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 #define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 
-#include <boost/context/all.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#include <boost/context/fcontext.hpp>
+#else
+#include <boost/context/detail/fcontext.hpp>
+#endif
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -18,27 +24,26 @@
 
 #include "Context.hpp"
 #include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace context {
 
-class BoostContext;
-class SerialBoostContext;
-class ParallelBoostContext;
-class BoostContextFactory;
-
 /** @brief Userspace context switching implementation based on Boost.Context */
 class BoostContext : public Context {
-protected: // static
-  static bool parallel_;
-  static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
-  static std::vector<BoostContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
-  static unsigned long process_index_;
+public:
+  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  ~BoostContext() override;
+  void stop() override;
+  virtual void resume() = 0;
+
+  static void swap(BoostContext* from, BoostContext* to);
+  static BoostContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(BoostContext* maestro) { maestro_context_ = maestro; }
+
+private:
   static BoostContext* maestro_context_;
+  void* stack_ = nullptr;
 
 #if BOOST_VERSION < 105600
   boost::context::fcontext_t* fc_ = nullptr;
@@ -50,23 +55,14 @@ protected: // static
   boost::context::detail::fcontext_t fc_;
   typedef boost::context::detail::transfer_t arg_type;
 #endif
-  static void wrapper(arg_type arg);
-  static void swap(BoostContext* from, BoostContext* to);
-
-#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
   const void* asan_stack_ = nullptr;
   size_t asan_stack_size_ = 0;
+  BoostContext* asan_ctx_ = nullptr;
   bool asan_stop_         = false;
 #endif
 
-  void* stack_ = nullptr;
-public:
-  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  ~BoostContext() override;
-  void stop() override;
-  virtual void resume() = 0;
-
-  friend BoostContextFactory;
+  static void wrapper(arg_type arg);
 };
 
 class SerialBoostContext : public BoostContext {
@@ -77,9 +73,13 @@ public:
   }
   void suspend() override;
   void resume() override;
+
+  static void run_all();
+
+private:
+  static unsigned long process_index_;
 };
 
-#if HAVE_THREAD_CONTEXTS
 class ParallelBoostContext : public BoostContext {
 public:
   ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
@@ -88,17 +88,28 @@ public:
   }
   void suspend() override;
   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<ParallelBoostContext*> workers_context_;
+  static std::atomic<uintptr_t> threads_working_;
+  static thread_local uintptr_t worker_id_;
 };
-#endif
 
 class BoostContextFactory : public ContextFactory {
 public:
   BoostContextFactory();
   ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t, smx_actor_t process) 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
 
 #endif