Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Rename ASAN_EVAL to ASAN_ONLY, and kill ASAN_ASSERT.
[simgrid.git] / src / kernel / context / ContextBoost.cpp
index dd24800..b75b44c 100644 (file)
@@ -1,24 +1,11 @@
-/* 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. */
 
 #include "ContextBoost.hpp"
-
-#include <utility>
-#include <xbt/log.h>
-
-#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
-#include <sanitizer/asan_interface.h>
-#define ASAN_EVAL(expr) (expr)
-#define ASAN_START_SWITCH(fake_stack_save, bottom, size) __sanitizer_start_switch_fiber(fake_stack_save, bottom, size)
-#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old)                                                      \
-  __sanitizer_finish_switch_fiber(fake_stack_save, bottom_old, size_old)
-#else
-#define ASAN_EVAL(expr) (void)0
-#define ASAN_START_SWITCH(fake_stack_save, bottom, size) (void)0
-#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) (void)(fake_stack_save)
-#endif
+#include "context_private.hpp"
+#include "src/simix/smx_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
@@ -34,10 +21,7 @@ BoostContextFactory::BoostContextFactory()
   BoostContext::setMaestro(nullptr);
   if (parallel_) {
 #if HAVE_THREAD_CONTEXTS
-    ParallelBoostContext::parmap_ = nullptr;
-    ParallelBoostContext::workers_context_.clear();
-    ParallelBoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-    xbt_os_thread_key_create(&ParallelBoostContext::worker_id_key_);
+    ParallelBoostContext::initialize();
 #else
     xbt_die("No thread support for parallel context execution");
 #endif
@@ -47,9 +31,8 @@ BoostContextFactory::BoostContextFactory()
 BoostContextFactory::~BoostContextFactory()
 {
 #if HAVE_THREAD_CONTEXTS
-  delete ParallelBoostContext::parmap_;
-  ParallelBoostContext::parmap_ = nullptr;
-  ParallelBoostContext::workers_context_.clear();
+  if (parallel_)
+    ParallelBoostContext::finalize();
 #endif
 }
 
@@ -67,30 +50,13 @@ smx_context_t BoostContextFactory::create_context(std::function<void()> code, vo
 void BoostContextFactory::run_all()
 {
 #if HAVE_THREAD_CONTEXTS
-  if (parallel_) {
-    ParallelBoostContext::threads_working_ = 0;
-    if (not ParallelBoostContext::parmap_)
-      ParallelBoostContext::parmap_ =
-          new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
-    ParallelBoostContext::parmap_->apply(
-        [](smx_actor_t process) {
-          BoostContext* context = static_cast<BoostContext*>(process->context);
-          return context->resume();
-        },
-        simix_global->process_to_run);
-    return;
-  }
+  if (parallel_)
+    ParallelBoostContext::run_all();
+  else
 #endif
-
-  if (simix_global->process_to_run.empty())
-    return;
-  smx_actor_t first_process          = simix_global->process_to_run.front();
-  SerialBoostContext::process_index_ = 1;
-  /* execute the first process */
-  static_cast<BoostContext*>(first_process->context)->resume();
+    SerialBoostContext::run_all();
 }
 
-
 // BoostContext
 
 BoostContext* BoostContext::maestro_context_ = nullptr;
@@ -109,7 +75,7 @@ BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cle
 #else
     void* stack = this->stack_;
 #endif
-    ASAN_EVAL(this->asan_stack_ = stack);
+    ASAN_ONLY(this->asan_stack_ = stack);
 #if BOOST_VERSION < 106100
     this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
 #else
@@ -140,10 +106,10 @@ void BoostContext::wrapper(BoostContext::arg_type arg)
 #if BOOST_VERSION < 106100
   BoostContext* context = reinterpret_cast<BoostContext*>(arg);
 #else
-  ASAN_FINISH_SWITCH(nullptr, &static_cast<BoostContext**>(arg.data)[0]->asan_stack_,
-                     &static_cast<BoostContext**>(arg.data)[0]->asan_stack_size_);
+  BoostContext* context = static_cast<BoostContext**>(arg.data)[1];
+  ASAN_ONLY(xbt_assert(context->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]));
+  ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
-  BoostContext* context                         = static_cast<BoostContext**>(arg.data)[1];
 #endif
   try {
     (*context)();
@@ -151,7 +117,7 @@ void BoostContext::wrapper(BoostContext::arg_type arg)
   } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
   }
-  ASAN_EVAL(context->asan_stop_ = true);
+  ASAN_ONLY(context->asan_stop_ = true);
   context->suspend();
 }
 
@@ -163,11 +129,12 @@ inline void BoostContext::swap(BoostContext* from, BoostContext* to)
   boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
 #else
   BoostContext* ctx[2] = {from, to};
-  void* fake_stack;
+  void* fake_stack     = nullptr;
+  ASAN_ONLY(to->asan_ctx_ = from);
   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);
-  ASAN_FINISH_SWITCH(fake_stack, &static_cast<BoostContext**>(arg.data)[0]->asan_stack_,
-                     &static_cast<BoostContext**>(arg.data)[0]->asan_stack_size_);
+  ASAN_ONLY(xbt_assert(from->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]));
+  ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
 #endif
 }
@@ -198,7 +165,7 @@ void SerialBoostContext::suspend()
     XBT_DEBUG("No more process to run");
     next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
   }
-  SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+  SIMIX_context_set_current(next_context);
   BoostContext::swap(this, next_context);
 }
 
@@ -208,14 +175,53 @@ void SerialBoostContext::resume()
   BoostContext::swap(BoostContext::getMaestro(), this);
 }
 
+void SerialBoostContext::run_all()
+{
+  if (simix_global->process_to_run.empty())
+    return;
+  smx_actor_t first_process = simix_global->process_to_run.front();
+  process_index_            = 1;
+  /* execute the first process */
+  static_cast<SerialBoostContext*>(first_process->context)->resume();
+}
+
 // ParallelBoostContext
 
 #if HAVE_THREAD_CONTEXTS
 
-simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_ = nullptr;
-uintptr_t ParallelBoostContext::threads_working_                 = 0;
+simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
+std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
 xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
-std::vector<BoostContext*> ParallelBoostContext::workers_context_;
+std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
+
+void ParallelBoostContext::initialize()
+{
+  parmap_ = nullptr;
+  workers_context_.clear();
+  workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
+  xbt_os_thread_key_create(&worker_id_key_);
+}
+
+void ParallelBoostContext::finalize()
+{
+  delete parmap_;
+  parmap_ = nullptr;
+  workers_context_.clear();
+  xbt_os_thread_key_destroy(worker_id_key_);
+}
+
+void ParallelBoostContext::run_all()
+{
+  threads_working_ = 0;
+  if (parmap_ == nullptr)
+    parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
+  parmap_->apply(
+      [](smx_actor_t process) {
+        ParallelBoostContext* context = static_cast<ParallelBoostContext*>(process->context);
+        context->resume();
+      },
+      simix_global->process_to_run);
+}
 
 void ParallelBoostContext::suspend()
 {
@@ -227,20 +233,20 @@ void ParallelBoostContext::suspend()
   } else {
     XBT_DEBUG("No more processes to run");
     uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
-    next_context        = static_cast<ParallelBoostContext*>(workers_context_[worker_id]);
+    next_context        = workers_context_[worker_id];
   }
 
-  SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+  SIMIX_context_set_current(next_context);
   BoostContext::swap(this, next_context);
 }
 
 void ParallelBoostContext::resume()
 {
-  uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1);
+  uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
   xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
 
   ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
-  workers_context_[worker_id] = worker_context;
+  workers_context_[worker_id]          = worker_context;
 
   SIMIX_context_set_current(this);
   BoostContext::swap(worker_context, this);