Further code simplifications now that the Thread context backend is always available

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

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 067e872..fb60021 100644 (file)
--- 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,17 +24,11 @@
 
 #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 {
 public:
@@ -38,8 +38,8 @@ public:
   virtual void resume() = 0;
 
   static void swap(BoostContext* from, BoostContext* to);
-  static BoostContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(BoostContext* maestro) { maestro_context_ = maestro; }
+  static BoostContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(BoostContext* maestro) { maestro_context_ = maestro; }
 
 private:
   static BoostContext* maestro_context_;
@@ -55,9 +55,10 @@ private:
   boost::context::detail::fcontext_t fc_;
   typedef boost::context::detail::transfer_t arg_type;
 #endif
-#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
 
@@ -65,8 +66,6 @@ private:
 };
 
 class SerialBoostContext : public BoostContext {
-  friend BoostContextFactory;
-
 public:
   SerialBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
       : BoostContext(std::move(code), cleanup_func, process)
@@ -75,14 +74,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 {
-  friend BoostContextFactory;
-
 public:
   ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
       : BoostContext(std::move(code), cleanup_func, process)
@@ -91,25 +89,27 @@ 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<BoostContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
+  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