X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fecac5b3070e10c780c6aa2f2b693f8cefe7e27..2d37e348a09783cda723c7019640ee69de168324:/src/kernel/context/ContextRaw.hpp

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index f2c9bc6765..ab3967b6b2 100644
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
@@ -6,17 +6,14 @@
 #ifndef SIMGRID_SIMIX_RAW_CONTEXT_HPP
 #define SIMGRID_SIMIX_RAW_CONTEXT_HPP
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
 
-#include <simgrid/simix.hpp>
 #include <xbt/parmap.hpp>
-#include <xbt/xbt_os_thread.h>
 
-#include "Context.hpp"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
+#include "src/kernel/context/ContextSwapped.hpp"
 
 namespace simgrid {
 namespace kernel {
@@ -27,72 +24,23 @@ namespace context {
   * The main difference to the System V context is that Raw Contexts are much faster because they don't
   * preserve the signal mask when switching. This saves a system call (at least on Linux) on each context switch.
   */
-class RawContext : public Context {
+class RawContext : public SwappedContext {
 public:
-  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  ~RawContext() override;
-  void stop() override;
-  virtual void resume() = 0;
+  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor,
+             SwappedContextFactory* factory);
 
-  static void swap(RawContext* from, RawContext* to);
-  static RawContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(RawContext* maestro) { maestro_context_ = maestro; }
+  void swap_into(SwappedContext* to) override;
 
 private:
-  static RawContext* maestro_context_;
-  void* stack_ = nullptr;
   /** pointer to top the stack stack */
   void* stack_top_ = nullptr;
 
   static void wrapper(void* arg);
 };
 
-class SerialRawContext : public RawContext {
+class RawContextFactory : public SwappedContextFactory {
 public:
-  SerialRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : RawContext(std::move(code), cleanup_func, process)
-  {
-  }
-  void suspend() override;
-  void resume() override;
-
-  static void run_all();
-
-private:
-  static unsigned long process_index_;
-};
-
-#if HAVE_THREAD_CONTEXTS
-class ParallelRawContext : public RawContext {
-public:
-  ParallelRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : RawContext(std::move(code), cleanup_func, process)
-  {
-  }
-  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<ParallelRawContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
-};
-#endif
-
-class RawContextFactory : public ContextFactory {
-public:
-  RawContextFactory();
-  ~RawContextFactory() 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