X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c4021b9c816f8b96b2d1eb15ed36eb090c7d9d..4c206c2ab2737c12672b8bc7aab7b0ea2cc99484:/src/kernel/context/ContextRaw.hpp

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index 82ff4462ec..b16fe7c612 100644
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -1,62 +1,57 @@
-/* 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. */
 
-#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
-#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
+#ifndef SIMGRID_SIMIX_RAW_CONTEXT_HPP
+#define SIMGRID_SIMIX_RAW_CONTEXT_HPP
 
+#include <atomic>
+#include <cstdint>
 #include <functional>
+#include <vector>
 
-#include "Context.hpp"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
+#include <xbt/parmap.hpp>
+#include <xbt/xbt_os_thread.h>
+
+#include "src/kernel/context/ContextSwapped.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace context {
 
-class RawContext;
-class RawContextFactory;
-
 /** @brief Fast context switching inspired from SystemV ucontexts.
   *
   * 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,
+             SwappedContextFactory* factory);
+  ~RawContext() override;
+
+  void swap_into(SwappedContext* to) override;
+
 private:
-  void* stack_ = nullptr;
   /** pointer to top the stack stack */
   void* stack_top_ = nullptr;
 
-public:
-  friend class RawContextFactory;
-  RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
-  ~RawContext() override;
+#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);
-  void stop() override;
-  void suspend() override;
-  void resume();
-
-private:
-  void suspend_serial();
-  void suspend_parallel();
-  void resume_serial();
-  void resume_parallel();
 };
 
-class RawContextFactory : public ContextFactory {
+class RawContextFactory : public SwappedContextFactory {
 public:
-  RawContextFactory();
-  ~RawContextFactory() override;
-  RawContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
-  void run_all() override;
+  RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
 
-private:
-  void run_all_serial();
-  void run_all_parallel();
+  Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
 };
 }}} // namespace