Merge pull request #228 from Takishipp/actor-execute

[simgrid.git] / src / kernel / context / ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index f7f40db3e307516e82bbf8b895454f7f737c61c8..0c31944bd33c09d93b24ee4999d6eb46155875f9 100644 (file)
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -7,7 +7,11 @@
 #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 <functional>
 #include <vector>
 
@@ -38,12 +42,23 @@ protected: // static
 
 #if BOOST_VERSION < 105600
   boost::context::fcontext_t* fc_ = nullptr;
-#else
+  typedef intptr_t ctx_arg_type;
+#elif BOOST_VERSION < 106100
   boost::context::fcontext_t fc_;
+  typedef intptr_t ctx_arg_type;
+#else
+  boost::context::detail::fcontext_t fc_;
+  typedef boost::context::detail::transfer_t ctx_arg_type;
 #endif
-  static void smx_ctx_boost_wrapper(intptr_t);
+  static void smx_ctx_boost_wrapper(ctx_arg_type);
   static void smx_ctx_boost_jump_fcontext(BoostContext*, BoostContext*);
 
+#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
+  const void* asan_stack_ = nullptr;
+  size_t asan_stack_size_ = 0;
+  bool asan_stop_         = false;
+#endif
+
   void* stack_ = nullptr;
 public:
   friend BoostContextFactory;
@@ -51,6 +66,7 @@ public:
           void_pfn_smxprocess_t cleanup_func,
           smx_actor_t process);
   ~BoostContext() override;
+  void stop() override;
   virtual void resume();
 private:
   static void wrapper(int first, ...);