Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index b550205..9f40217 100644 (file)
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -3,6 +3,7 @@
 /* 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 "simgrid/Exception.hpp"
 #include "simgrid/modelchecker.h"
 #include "src/internal_config.h"
 #include "src/kernel/context/context_private.hpp"
@@ -37,24 +38,23 @@ namespace context {
 /* rank of the execution thread */
 thread_local uintptr_t SwappedContext::worker_id_;             /* thread-specific storage for the thread id */
 
-SwappedContextFactory::SwappedContextFactory(std::string name)
-    : ContextFactory(name), parallel_(SIMIX_context_is_parallel())
+SwappedContextFactory::SwappedContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel())
 {
   parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel)
-  workers_context_.clear();
   workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr);
 }
 SwappedContextFactory::~SwappedContextFactory()
 {
   delete parmap_;
-  parmap_ = nullptr;
-  workers_context_.clear();
 }
 
-SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
-                               SwappedContextFactory* factory)
-    : Context(std::move(code), cleanup_func, process), factory_(factory)
+SwappedContext::SwappedContext(std::function<void()> code, smx_actor_t actor, SwappedContextFactory* factory)
+    : Context(std::move(code), actor), factory_(factory)
 {
+  // Save maestro (=context created first) in preparation for run_all
+  if (not factory->parallel_ && factory_->workers_context_[0] == nullptr)
+    factory_->workers_context_[0] = this;
+
   if (has_code()) {
     if (smx_context_guard_size > 0 && not MC_is_active()) {
 
@@ -98,6 +98,11 @@ SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t
       this->stack_ = xbt_malloc0(smx_context_stack_size);
     }
 
+#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
 #if HAVE_VALGRIND_H
     unsigned int valgrind_stack_id =
         VALGRIND_STACK_REGISTER(this->stack_, (char*)this->stack_ + smx_context_stack_size);
@@ -134,12 +139,6 @@ SwappedContext::~SwappedContext()
   xbt_free(stack_);
 }
 
-void SwappedContext::set_maestro(SwappedContext* ctx)
-{
-  if (factory_->threads_working_ == 0) // Don't save the soul of minions, only the one of maestro
-    factory_->workers_context_[0] = ctx;
-}
-
 void* SwappedContext::get_stack()
 {
   return stack_;
@@ -149,7 +148,7 @@ void SwappedContext::stop()
 {
   Context::stop();
   /* We must cut the actor execution using an exception to properly free the C++ RAII variables */
-  throw StopRequest();
+  throw ForcefulKillException();
 }
 
 /** Maestro wants to run all ready actors */
@@ -177,13 +176,13 @@ void SwappedContextFactory::run_all()
           SwappedContext* context = static_cast<SwappedContext*>(process->context_);
           context->resume();
         },
-        simix_global->process_to_run);
+        simix_global->actors_to_run);
   } else { // sequential execution
-    if (simix_global->process_to_run.empty())
+    if (simix_global->actors_to_run.empty())
       return;
 
     /* maestro is already saved in the first slot of workers_context_ */
-    smx_actor_t first_actor = simix_global->process_to_run.front();
+    smx_actor_t first_actor = simix_global->actors_to_run.front();
     process_index_          = 1;
     /* execute the first actor; it will chain to the others when using suspend() */
     static_cast<SwappedContext*>(first_actor->context_)->resume();
@@ -208,7 +207,7 @@ void SwappedContext::resume()
     Context::set_current(this);
     worker_context->swap_into(this);
     // No body runs that soul anymore at this point, but it is stored in a safe place.
-    // When the executed actor will do a blocking action, SIMIX_process_yield() will call suspend(), below.
+    // When the executed actor will do a blocking action, ActorImpl::yield() will call suspend(), below.
   } else { // sequential execution
     SwappedContext* old = static_cast<SwappedContext*>(self());
     Context::set_current(this);
@@ -216,7 +215,7 @@ void SwappedContext::resume()
   }
 }
 
-/** The actor wants to yield back to maestro, because it is blocked in a simcall (ie in SIMIX_process_yield())
+/** The actor wants to yield back to maestro, because it is blocked in a simcall (i.e., in ActorImpl::yield())
  *
  * Actually, it does not really yield back to maestro, but directly into the next executable actor.
  *
@@ -252,10 +251,10 @@ void SwappedContext::suspend()
     unsigned long int i = factory_->process_index_;
     factory_->process_index_++;
 
-    if (i < simix_global->process_to_run.size()) {
+    if (i < simix_global->actors_to_run.size()) {
       /* Actually swap into the next actor directly without transiting to maestro */
       XBT_DEBUG("Run next actor");
-      next_context = static_cast<SwappedContext*>(simix_global->process_to_run[i]->context_);
+      next_context = static_cast<SwappedContext*>(simix_global->actors_to_run[i]->context_);
     } else {
       /* all processes were run, actually return to maestro */
       XBT_DEBUG("No more actors to run");