namespace kernel {
namespace context {
-/* rank of the execution thread */
-thread_local uintptr_t SwappedContext::worker_id_; /* thread-specific storage for the thread id */
-
-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_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr);
-}
+/* thread-specific storage for the worker's context */
+thread_local SwappedContext* SwappedContext::worker_context_ = nullptr;
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 (not SIMIX_context_is_parallel() && factory->maestro_context_ == nullptr)
+ factory->maestro_context_ = this;
if (has_code()) {
xbt_assert((smx_context_stack_size & 0xf) == 0, "smx_context_stack_size should be multiple of 16");
if (smx_context_guard_size > 0 && not MC_is_active()) {
-
#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1)
xbt_die(
"Stack overflow protection is known to be broken on your system: you stacks grow upwards (or detection is "
* stuff It is much easier to understand what happens if you see the working threads as bodies that swap their soul
* for the ones of the simulated processes that must run.
*/
- if (parallel_) {
- threads_working_ = 0;
-
+ if (SIMIX_context_is_parallel()) {
// We lazily create the parmap so that all options are actually processed when doing so.
if (parmap_ == nullptr)
parmap_.reset(
// It only yields back to worker_context when the work array is exhausted.
// - So, resume() is only launched from the parmap for the first job of each minion.
parmap_->apply(
- [](smx_actor_t process) {
+ [](const actor::ActorImpl* process) {
SwappedContext* context = static_cast<SwappedContext*>(process->context_.get());
context->resume();
},
return;
/* maestro is already saved in the first slot of workers_context_ */
- smx_actor_t first_actor = simix_global->actors_to_run.front();
+ const actor::ActorImpl* 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_.get())->resume();
*/
void SwappedContext::resume()
{
- if (factory_->parallel_) {
- // Save the thread number (my body) in an os-thread-specific area
- worker_id_ = factory_->threads_working_.fetch_add(1, std::memory_order_relaxed);
- // Save my current soul (either maestro, or one of the minions) in a permanent area
- SwappedContext* worker_context = static_cast<SwappedContext*>(self());
- factory_->workers_context_[worker_id_] = worker_context;
+ if (SIMIX_context_is_parallel()) {
+ // Save my current soul (either maestro, or one of the minions) in a thread-specific area
+ worker_context_ = static_cast<SwappedContext*>(self());
// Switch my soul and the actor's one
Context::set_current(this);
- worker_context->swap_into(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, ActorImpl::yield() will call suspend(), below.
} else { // sequential execution
*/
void SwappedContext::suspend()
{
- if (factory_->parallel_) {
+ if (SIMIX_context_is_parallel()) {
// Get some more work to directly swap into the next executable actor instead of yielding back to the parmap
boost::optional<smx_actor_t> next_work = factory_->parmap_->next();
SwappedContext* next_context;
} else {
// All actors were run, go back to the parmap context
XBT_DEBUG("No more actors to run");
- // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round
- next_context = factory_->workers_context_[worker_id_];
+ // worker_context_ is my own soul, stored in thread_local when starting the scheduling round
+ next_context = worker_context_;
// When given that soul, the body will wait for the next scheduling round
}
} else {
/* all processes were run, actually return to maestro */
XBT_DEBUG("No more actors to run");
- next_context = factory_->workers_context_[0];
+ next_context = factory_->maestro_context_;
}
Context::set_current(next_context);
this->swap_into(next_context);
