X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e3adb6026f929615076da0e5a32dc35a02db573..4c206c2ab2737c12672b8bc7aab7b0ea2cc99484:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 7e9414d233..a1548e67a7 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015. 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,64 +6,66 @@
 #ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 #define SIMGRID_SIMIX_BOOST_CONTEXT_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>
 
-#include <xbt/parmap.h>
-
 #include <simgrid/simix.hpp>
+#include <xbt/parmap.hpp>
+#include <xbt/xbt_os_thread.h>
 
+#include "src/internal_config.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/kernel/context/ContextSwapped.hpp"
 
 namespace simgrid {
-namespace simix {
-
-class BoostContext;
-class BoostSerialContext;
-class BoostParallelContext;
-class BoostContextFactory;
+namespace kernel {
+namespace context {
 
 /** @brief Userspace context switching implementation based on Boost.Context */
-class BoostContext : public Context {
-protected: // static
-  static bool parallel_;
-  static xbt_parmap_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_;
-  static BoostContext* maestro_context_;
-protected:
-#if HAVE_BOOST_CONTEXTS == 1
-  boost::context::fcontext_t* fc_ = nullptr;
-#else
-  boost::context::fcontext_t fc_;
-#endif
-  void* stack_ = nullptr;
+class BoostContext : public SwappedContext {
 public:
-  friend BoostContextFactory;
-  BoostContext(std::function<void()> code,
-          void_pfn_smxprocess_t cleanup_func,
-          smx_process_t process);
+  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+               SwappedContextFactory* factory);
   ~BoostContext() override;
-  virtual void resume();
+
+  void swap_into(SwappedContext* to) override;
+
 private:
-  static void wrapper(int first, ...);
+#if BOOST_VERSION < 105600
+  boost::context::fcontext_t* fc_ = nullptr;
+  typedef intptr_t arg_type;
+#elif BOOST_VERSION < 106100
+  boost::context::fcontext_t fc_;
+  typedef intptr_t arg_type;
+#else
+  boost::context::detail::fcontext_t fc_;
+  typedef boost::context::detail::transfer_t arg_type;
+#endif
+#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
+
+  static void wrapper(arg_type arg);
 };
 
-class BoostContextFactory : public ContextFactory {
+class BoostContextFactory : public SwappedContextFactory {
 public:
-  friend BoostContext;
-  friend BoostSerialContext;
-  friend BoostParallelContext;
+  BoostContextFactory() : SwappedContextFactory("BoostContextFactory") {}
 
-  BoostContextFactory();
-  ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t, smx_process_t process) override;
-  void run_all() override;
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
 };
-
-}
-}
+}}} // namespace
 
 #endif