Methods and renaming in simix::Global

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

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index 3c89743..364b822 100644 (file)
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -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);
@@ -171,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();
@@ -246,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");