simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
-xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
+thread_local uintptr_t ParallelBoostContext::worker_id_;
std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
void ParallelBoostContext::initialize()
parmap_ = nullptr;
workers_context_.clear();
workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
- xbt_os_thread_key_create(&worker_id_key_);
}
void ParallelBoostContext::finalize()
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
- xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelBoostContext::run_all()
next_context = static_cast<ParallelBoostContext*>(next_work.get()->context_);
} else {
XBT_DEBUG("No more processes to run");
- uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
- next_context = workers_context_[worker_id];
+ next_context = workers_context_[worker_id_];
}
SIMIX_context_set_current(next_context);
void ParallelBoostContext::resume()
{
- uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
- xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+ worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
- workers_context_[worker_id] = worker_context;
+ workers_context_[worker_id_] = worker_context;
SIMIX_context_set_current(this);
BoostContext::swap(worker_context, this);
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelBoostContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
- static xbt_os_thread_key_t worker_id_key_;
+ static thread_local uintptr_t worker_id_;
};
#endif
simgrid::xbt::Parmap<smx_actor_t>* ParallelRawContext::parmap_;
std::atomic<uintptr_t> ParallelRawContext::threads_working_; /* number of threads that have started their work */
-xbt_os_thread_key_t ParallelRawContext::worker_id_key_; /* thread-specific storage for the thread id */
+uintptr_t thread_local ParallelRawContext::worker_id_; /* thread-specific storage for the thread id */
std::vector<ParallelRawContext*> ParallelRawContext::workers_context_; /* space to save the worker context
in each thread */
parmap_ = nullptr;
workers_context_.clear();
workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
- xbt_os_thread_key_create(&worker_id_key_);
}
void ParallelRawContext::finalize()
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
- xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelRawContext::run_all()
} else {
/* all processes were run, go to the barrier */
XBT_DEBUG("No more processes to run");
- uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
- next_context = workers_context_[worker_id];
- XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, threads_working_.load());
+ next_context = workers_context_[worker_id_];
+ XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load());
}
SIMIX_context_set_current(next_context);
void ParallelRawContext::resume()
{
- uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
- xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+ worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(SIMIX_context_self());
- workers_context_[worker_id] = worker_context;
- XBT_DEBUG("Saving worker stack %zu", worker_id);
+ workers_context_[worker_id_] = worker_context;
+ XBT_DEBUG("Saving worker stack %zu", worker_id_);
SIMIX_context_set_current(this);
RawContext::swap(worker_context, this);
}
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelRawContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
- static xbt_os_thread_key_t worker_id_key_;
+ static uintptr_t thread_local worker_id_;
};
#endif
simgrid::xbt::Parmap<smx_actor_t>* ParallelUContext::parmap_;
std::atomic<uintptr_t> ParallelUContext::threads_working_; /* number of threads that have started their work */
-xbt_os_thread_key_t ParallelUContext::worker_id_key_; /* thread-specific storage for the thread id */
+thread_local uintptr_t ParallelUContext::worker_id_; /* thread-specific storage for the thread id */
std::vector<ParallelUContext*> ParallelUContext::workers_context_; /* space to save the worker's context
* in each thread */
parmap_ = nullptr;
workers_context_.clear();
workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
- xbt_os_thread_key_create(&worker_id_key_);
}
void ParallelUContext::finalize()
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
- xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelUContext::run_all()
} else {
// All processes were run, go to the barrier
XBT_DEBUG("No more processes to run");
- // Get back the identity of my body that was stored when starting the scheduling round
- uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
+ // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round
// Deduce the initial soul of that body
- next_context = workers_context_[worker_id];
+ next_context = workers_context_[worker_id_];
// When given that soul, the body will wait for the next scheduling round
}
/** Run one particular simulated process on the current thread. */
void ParallelUContext::resume()
{
- // What is my containing body?
- uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
- // Store the number of my containing body in os-thread-specific area :
- xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+ // What is my containing body? Store its number in os-thread-specific area :
+ worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
// Get my current soul:
ParallelUContext* worker_context = static_cast<ParallelUContext*>(SIMIX_context_self());
// Write down that this soul is hosted in that body (for now)
- workers_context_[worker_id] = worker_context;
+ workers_context_[worker_id_] = worker_context;
// Write in simix that I switched my soul
SIMIX_context_set_current(this);
// Actually do that using the relevant library call:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelUContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
- static xbt_os_thread_key_t worker_id_key_;
+ static thread_local uintptr_t worker_id_;
};
#endif