Factorize some of the ASAN_ONLY code.

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

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 622f5b4..c7a0a1c 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. 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. */
@@ -189,36 +189,23 @@ namespace context {
 Context* RawContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
                                            smx_actor_t process)
 {
-  if (parallel_)
-    return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process, this);
   return this->new_context<RawContext>(std::move(code), cleanup_func, process, this);
 }
 
 // RawContext
 
-RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process,
+RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t actor,
                        SwappedContextFactory* factory)
-    : SwappedContext(std::move(code), cleanup, process, factory)
+    : SwappedContext(std::move(code), cleanup, actor, factory)
 {
    if (has_code()) {
-#if PTH_STACKGROWTH == -1
-     ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
-#else
-     ASAN_ONLY(this->asan_stack_ = this->stack_);
-#endif
-     this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this);
+     this->stack_top_ = raw_makecontext(get_stack(), smx_context_usable_stack_size, RawContext::wrapper, this);
    } else {
-     if (process != nullptr && get_maestro() == nullptr)
-       set_maestro(this);
-     if (MC_is_active()) {
-       XBT_ATTRIB_UNUSED RawContext* maestro = static_cast<RawContext*>(get_maestro());
-       MC_ignore_heap(&maestro->stack_top_, sizeof(maestro->stack_top_));
-     }
+     if (MC_is_active())
+       MC_ignore_heap(&stack_top_, sizeof(stack_top_));
    }
 }
 
-RawContext::~RawContext() = default;
-
 void RawContext::wrapper(void* arg)
 {
   RawContext* context = static_cast<RawContext*>(arg);
@@ -241,42 +228,10 @@ void RawContext::swap_into(SwappedContext* to_)
 {
   RawContext* to = static_cast<RawContext*>(to_);
   ASAN_ONLY(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_);
+  ASAN_ONLY(to->asan_ctx_ = this);
+  ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   raw_swapcontext(&this->stack_top_, to->stack_top_);
-  ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
-}
-
-// ParallelRawContext
-
-void ParallelRawContext::suspend()
-{
-  /* determine the next context */
-  boost::optional<smx_actor_t> next_work = parmap_->next();
-  SwappedContext* next_context;
-  if (next_work) {
-    /* there is a next process to resume */
-    XBT_DEBUG("Run next process");
-    next_context = static_cast<ParallelRawContext*>(next_work.get()->context_);
-  } else {
-    /* all processes were run, go to the barrier */
-    XBT_DEBUG("No more processes to run");
-    next_context = workers_context_[worker_id_];
-    XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load());
-  }
-
-  Context::set_current(next_context);
-  this->swap_into(next_context);
-}
-
-void ParallelRawContext::resume()
-{
-  worker_id_                     = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  SwappedContext* worker_context = static_cast<SwappedContext*>(self());
-  workers_context_[worker_id_]   = worker_context;
-  XBT_DEBUG("Saving worker stack %zu", worker_id_);
-  Context::set_current(this);
-  worker_context->swap_into(this);
+  ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_);
 }
 
 ContextFactory* raw_factory()