Boost contexts: add an assert checking that we don't mix up originating context.

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

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 1132f98..1a9ae4e 100644 (file)
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-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. */
@@ -13,6 +13,7 @@
 #include <boost/context/detail/fcontext.hpp>
 #endif
 
+#include <atomic>
 #include <cstdint>
 #include <functional>
 #include <vector>
@@ -23,7 +24,6 @@
 
 #include "Context.hpp"
 #include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
 
 namespace simgrid {
 namespace kernel {
@@ -58,6 +58,7 @@ private:
 #if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
   const void* asan_stack_ = nullptr;
   size_t asan_stack_size_ = 0;
+  BoostContext* asan_ctx_ = nullptr;
   bool asan_stop_         = false;
 #endif
 
@@ -96,7 +97,7 @@ public:
 private:
   static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
   static std::vector<ParallelBoostContext*> workers_context_;
-  static uintptr_t threads_working_;
+  static std::atomic<uintptr_t> threads_working_;
   static xbt_os_thread_key_t worker_id_key_;
 };
 #endif