X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87c589b94e563580e8e0585079cdba97914d791d..82e2aa78964d9150810411ce80fa62ab3aa4aaa9:/src/kernel/context/ContextUnix.hpp

diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp
index 70852d0eb7..cec22ac4a3 100644
--- a/src/kernel/context/ContextUnix.hpp
+++ b/src/kernel/context/ContextUnix.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. 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. */
@@ -15,7 +15,6 @@
 
 #include <simgrid/simix.hpp>
 #include <xbt/parmap.hpp>
-#include <xbt/xbt_os_thread.h>
 
 #include "src/internal_config.h"
 #include "src/kernel/context/ContextSwapped.hpp"
@@ -26,48 +25,20 @@ namespace context {
 
 class UContext : public SwappedContext {
 public:
-  UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  ~UContext() override;
-  void stop() override;
+  UContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
 
   void swap_into(SwappedContext* to) override;
 
 private:
   ucontext_t uc_;         /* the ucontext that executes the code */
-
-#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
-
-  static void smx_ctx_sysv_wrapper(int, int);
-  static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
 };
 
-class ParallelUContext : public UContext {
+class UContextFactory : public SwappedContextFactory {
 public:
-  ParallelUContext(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();
-};
-
-class UContextFactory : public ContextFactory {
-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;
-
-private:
-  bool parallel_;
+  UContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
 };
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 #endif