X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3580c1f2e5172b721449d0e79c72241bd012152a..a76526cb68465af7b566a4afc6fff7893be6a94d:/src/kernel/context/ContextRaw.hpp

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index b014a1a37a..2d975e70ea 100644
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2020. 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. */
 
-#ifndef SIMGRID_SIMIX_RAW_CONTEXT_HPP
-#define SIMGRID_SIMIX_RAW_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP
 
 #include <atomic>
 #include <cstdint>
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include <xbt/parmap.hpp>
-#include <xbt/xbt_os_thread.h>
 
 #include "src/kernel/context/ContextSwapped.hpp"
 
@@ -27,10 +26,7 @@ namespace context {
   */
 class RawContext : public SwappedContext {
 public:
-  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
-             SwappedContextFactory* factory);
-  ~RawContext() override;
-  void stop() override;
+  RawContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
 
   void swap_into(SwappedContext* to) override;
 
@@ -38,35 +34,15 @@ private:
   /** pointer to top the stack stack */
   void* stack_top_ = nullptr;
 
-#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
-  const void* asan_stack_ = nullptr;
-  size_t asan_stack_size_ = 0;
-  RawContext* asan_ctx_   = nullptr;
-  bool asan_stop_         = false;
-#endif
-
-  static void wrapper(void* arg);
-};
-
-class ParallelRawContext : public RawContext {
-public:
-  ParallelRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
-                     SwappedContextFactory* factory)
-      : RawContext(std::move(code), cleanup_func, process, factory)
-  {
-  }
-  void suspend() override;
-  void resume() override;
-
-  static void run_all();
+  XBT_ATTRIB_NORETURN static void wrapper(RawContext* context);
 };
 
 class RawContextFactory : public SwappedContextFactory {
 public:
-  RawContextFactory();
-  ~RawContextFactory() override;
-  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
+  RawContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
 };
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 #endif