delete parmap_;
}
-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 (factory_->workers_context_[0] == nullptr)
+ if (not factory->parallel_ && factory_->workers_context_[0] == nullptr)
factory_->workers_context_[0] = this;
if (has_code()) {
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);
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();
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);
}
}
-/** 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.
*
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");