XBT_DEBUG("No more process to run");
next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
}
- SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+ SIMIX_context_set_current(next_context);
BoostContext::swap(this, next_context);
}
#if HAVE_THREAD_CONTEXTS
simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
-uintptr_t ParallelBoostContext::threads_working_;
+std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
void ParallelBoostContext::run_all()
{
threads_working_ = 0;
- if (not parmap_)
+ if (parmap_ == nullptr)
parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
parmap_->apply(
[](smx_actor_t process) {
ParallelBoostContext* context = static_cast<ParallelBoostContext*>(process->context);
- return context->resume();
+ context->resume();
},
simix_global->process_to_run);
}
void ParallelBoostContext::resume()
{
- uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1);
+ 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));
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);