X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5cbd0a045f9b4c686d265723f542dd92f47593b..323010d1c247d0097b2cdc79d1da143846461999:/src/kernel/context/ContextUnix.hpp

diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp
index 256fcc0c0e..88976a8253 100644
--- a/src/kernel/context/ContextUnix.hpp
+++ b/src/kernel/context/ContextUnix.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -8,6 +8,7 @@
 
 #include <ucontext.h> /* context relative declarations */
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -31,7 +32,7 @@ public:
   void stop() override;
   virtual void resume() = 0;
 
-  static void swap(UContext* from, UContext* to) { swapcontext(&from->uc_, &to->uc_); }
+  static void swap(UContext* from, UContext* to);
   static UContext* getMaestro() { return maestro_context_; }
   static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
 
@@ -40,8 +41,15 @@ private:
   void* stack_ = nullptr; /* the thread stack */
   ucontext_t uc_;         /* the ucontext that executes the code */
 
-  static void wrapper(int, int);
-  static void makecontext(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
+#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 SerialUContext : public UContext {
@@ -76,8 +84,8 @@ public:
 private:
   static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
   static std::vector<ParallelUContext*> workers_context_;
-  static uintptr_t threads_working_;
-  static xbt_os_thread_key_t worker_id_key_;
+  static std::atomic<uintptr_t> threads_working_;
+  static thread_local uintptr_t worker_id_;
 };
 #endif