Move ASan related instructions around context swapping into SwappedContext.

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

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index 63fe3b7..f9b30e0 100644 (file)
--- 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,43 +26,21 @@ 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 swap_into(SwappedContext* to) override;
+  RawContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
 
 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;
+  void swap_into_for_real(SwappedContext* to) override;
 };
 
 class RawContextFactory : public SwappedContextFactory {
 public:
-  RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
-
-  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