X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8da9378a1529be135b2b980915e77cd958134c98..630f6085be5dfa41c4fee13930e8a87026a75d78:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 0c6a35ba71..8284fc9835 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-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_BOOST_CONTEXT_HPP
-#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
 
 #include <boost/version.hpp>
 #if BOOST_VERSION < 106100
@@ -12,72 +12,48 @@
 #else
 #include <boost/context/detail/fcontext.hpp>
 #endif
+
+#include <atomic>
+#include <cstdint>
 #include <functional>
 #include <vector>
 
-#include <xbt/parmap.hpp>
-
 #include <simgrid/simix.hpp>
+#include <xbt/parmap.hpp>
 
+#include "src/internal_config.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/kernel/context/ContextSwapped.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace context {
 
-class BoostContext;
-class BoostSerialContext;
-class BoostParallelContext;
-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_;
-  static BoostContext* maestro_context_;
+class BoostContext : public SwappedContext {
+public:
+  BoostContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
 
-#if BOOST_VERSION < 105600
-  boost::context::fcontext_t* fc_ = nullptr;
-  typedef intptr_t ctx_arg_type;
-#elif BOOST_VERSION < 106100
+private:
+#if BOOST_VERSION < 106100
   boost::context::fcontext_t fc_;
-  typedef intptr_t ctx_arg_type;
+  typedef intptr_t arg_type;
 #else
   boost::context::detail::fcontext_t fc_;
-  typedef boost::context::detail::transfer_t ctx_arg_type;
+  typedef boost::context::detail::transfer_t arg_type;
 #endif
-  static void smx_ctx_boost_wrapper(ctx_arg_type);
-  static void smx_ctx_boost_jump_fcontext(BoostContext*, BoostContext*);
 
-  void* stack_ = nullptr;
-public:
-  friend BoostContextFactory;
-  BoostContext(std::function<void()> code,
-          void_pfn_smxprocess_t cleanup_func,
-          smx_actor_t process);
-  ~BoostContext() override;
-  virtual void resume();
-private:
-  static void wrapper(int first, ...);
+  XBT_ATTRIB_NORETURN static void wrapper(arg_type arg);
+
+  void swap_into_for_real(SwappedContext* to) override;
 };
 
-class BoostContextFactory : public ContextFactory {
+class BoostContextFactory : public SwappedContextFactory {
 public:
-  friend BoostContext;
-  friend BoostSerialContext;
-  friend BoostParallelContext;
-
-  BoostContextFactory();
-  ~BoostContextFactory() override;
-  Context* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t, smx_actor_t process) override;
-  void run_all() override;
+  BoostContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
 };
-
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 #endif