X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7f87282045aad5c82fee922140dc5c60320b87b..15f9e0adbd11d2a0736440004a2f71ef9cfccab8:/src/kernel/context/ContextUnix.hpp

diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp
index 91badf2d55..d1aeff2e28 100644
--- a/src/kernel/context/ContextUnix.hpp
+++ b/src/kernel/context/ContextUnix.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
@@ -8,6 +8,7 @@
 
 #include <ucontext.h> /* context relative declarations */
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -16,80 +17,51 @@
 #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 {
 namespace context {
 
-class UContext : public Context {
+class UContext : public SwappedContext {
 public:
-  UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+           SwappedContextFactory* factory);
   ~UContext() override;
-  void stop() override;
-  virtual void resume() = 0;
 
-  static void swap(UContext* from, UContext* to) { swapcontext(&from->uc_, &to->uc_); }
-  static UContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
+  void swap_into(SwappedContext* to) override;
 
 private:
-  static UContext* maestro_context_;
-  void* stack_ = nullptr; /* the thread stack */
   ucontext_t uc_;         /* the ucontext that executes the code */
 
-  static void wrapper(int, int);
-  static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
-};
-
-class SerialUContext : public UContext {
-public:
-  SerialUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : UContext(std::move(code), cleanup_func, process)
-  {
-  }
-  void suspend() override;
-  void resume() override;
-
-  static void run_all();
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+  const void* asan_stack_ = nullptr;
+  size_t asan_stack_size_ = 0;
+  UContext* asan_ctx_     = nullptr;
+  bool asan_stop_         = false;
+#endif
 
-private:
-  static unsigned long process_index_;
+  static void smx_ctx_sysv_wrapper(int, int);
+  static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
 };
 
-#if HAVE_THREAD_CONTEXTS
 class ParallelUContext : public UContext {
 public:
-  ParallelUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-      : UContext(std::move(code), cleanup_func, process)
+  ParallelUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+                   SwappedContextFactory* factory)
+      : UContext(std::move(code), cleanup_func, process, factory)
   {
   }
   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<ParallelUContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
 };
-#endif
 
-class UContextFactory : public ContextFactory {
+class UContextFactory : public SwappedContextFactory {
 public:
-  UContextFactory();
-  ~UContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
-  void run_all() override;
+  UContextFactory() : SwappedContextFactory("UContextFactory") {}
 
-private:
-  bool parallel_;
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
 };
 }}} // namespace