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

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 660601489c..adca9a2e9f 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,69 +1,61 @@
-/* Copyright (c) 2015. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2015-2023. 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_BOOST_CONTEXT_HPP
-#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
 
-#include <functional>
-#include <vector>
+/* Boost uses undef preprocessor symbols on FreeBSD, so disable our Werror for this file */
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundef"
+#endif
 
-#include <xbt/parmap.h>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#include <boost/context/fcontext.hpp>
+#else
+#include <boost/context/detail/fcontext.hpp>
+#endif
 
-#include <simgrid/simix.hpp>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 
+#include <atomic>
+#include <cstdint>
+#include <functional>
+#include <vector>
 
-namespace simgrid {
-namespace kernel {
-namespace context {
+#include "src/kernel/context/ContextSwapped.hpp"
+#include "src/xbt/parmap.hpp"
 
-class BoostContext;
-class BoostSerialContext;
-class BoostParallelContext;
-class BoostContextFactory;
+namespace simgrid::kernel::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_actor_t process);
-  ~BoostContext() override;
-  virtual void resume();
+  BoostContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
+
 private:
-  static void wrapper(int first, ...);
-};
+#if BOOST_VERSION < 106100
+  boost::context::fcontext_t fc_{};
+  using arg_type = intptr_t;
+#else
+  boost::context::detail::fcontext_t fc_{};
+  using arg_type = boost::context::detail::transfer_t;
+#endif
 
-class BoostContextFactory : public ContextFactory {
-public:
-  friend BoostContext;
-  friend BoostSerialContext;
-  friend BoostParallelContext;
+  XBT_ATTRIB_NORETURN static void wrapper(arg_type arg);
 
-  BoostContextFactory();
-  ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t, smx_actor_t process) override;
-  void run_all() override;
+  void swap_into_for_real(SwappedContext* to) override;
 };
 
-}}} // namespace
+class BoostContextFactory : public SwappedContextFactory {
+public:
+  BoostContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
+};
+} // namespace simgrid::kernel::context
 
 #endif