unify how threaded and parallelisable context factories find context_self

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

diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp
index b4f30ec..e1ececd 100644 (file)
--- a/src/kernel/context/ContextRaw.hpp
+++ b/src/kernel/context/ContextRaw.hpp
@@ -1,23 +1,19 @@
-/* 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 <simgrid/simix.hpp>
 #include <xbt/parmap.hpp>
 #include <xbt/xbt_os_thread.h>
 
-#include "Context.hpp"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
-
 namespace simgrid {
 namespace kernel {
 namespace context {
@@ -35,8 +31,8 @@ public:
   virtual void resume() = 0;
 
   static void swap(RawContext* from, RawContext* to);
-  static RawContext* getMaestro() { return maestro_context_; }
-  static void setMaestro(RawContext* maestro) { maestro_context_ = maestro; }
+  static RawContext* get_maestro() { return maestro_context_; }
+  static void set_maestro(RawContext* maestro) { maestro_context_ = maestro; }
 
 private:
   static RawContext* maestro_context_;
@@ -44,6 +40,13 @@ 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);
 };
 
@@ -62,7 +65,6 @@ private:
   static unsigned long process_index_;
 };
 
-#if HAVE_THREAD_CONTEXTS
 class ParallelRawContext : public RawContext {
 public:
   ParallelRawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
@@ -79,10 +81,9 @@ public:
 private:
   static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
   static std::vector<ParallelRawContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
+  static std::atomic<uintptr_t> threads_working_;
+  static uintptr_t thread_local worker_id_;
 };
-#endif
 
 class RawContextFactory : public ContextFactory {
 public: