s/process/actor/ A lot remains TBD about it

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

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 643549c..d78cc23 100644 (file)
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2019. 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. */
@@ -20,7 +20,6 @@
 
 #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"
@@ -33,9 +32,9 @@ namespace context {
 /** @brief Userspace context switching implementation based on Boost.Context */
 class BoostContext : public SwappedContext {
 public:
-  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor,
+               SwappedContextFactory* factory);
   ~BoostContext() override;
-  void stop() override;
 
   void swap_into(SwappedContext* to) override;
 
@@ -60,35 +59,11 @@ private:
   static void wrapper(arg_type arg);
 };
 
-class ParallelBoostContext : public BoostContext {
+class BoostContextFactory : public SwappedContextFactory {
 public:
-  ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : BoostContext(std::move(code), cleanup_func, process)
-  {
-  }
-  void suspend() override;
-  void resume() override;
+  BoostContextFactory() : SwappedContextFactory("BoostContextFactory") {}
 
-  static void initialize();
-  static void finalize();
-  static void run_all();
-
-private:
-  static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
-  static std::vector<ParallelBoostContext*> workers_context_;
-  static std::atomic<uintptr_t> threads_working_;
-  static thread_local uintptr_t worker_id_;
-};
-
-class BoostContextFactory : public ContextFactory {
-public:
-  BoostContextFactory();
-  ~BoostContextFactory() 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