From: Martin Quinson Date: Wed, 18 Jul 2018 19:08:40 +0000 (+0200) Subject: reimplement the parallel contextes with C++11 w/o xbt_os_thread_set_specific() X-Git-Tag: v3_21~396 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/28b5150327b910baeb296a2587c7175a65f2bff7 reimplement the parallel contextes with C++11 w/o xbt_os_thread_set_specific() --- diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index bff914d061..a0fb566231 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -191,7 +191,7 @@ void SerialBoostContext::run_all() simgrid::xbt::Parmap* ParallelBoostContext::parmap_; std::atomic ParallelBoostContext::threads_working_; -xbt_os_thread_key_t ParallelBoostContext::worker_id_key_; +thread_local uintptr_t ParallelBoostContext::worker_id_; std::vector ParallelBoostContext::workers_context_; void ParallelBoostContext::initialize() @@ -199,7 +199,6 @@ 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() @@ -207,7 +206,6 @@ void ParallelBoostContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelBoostContext::run_all() @@ -232,8 +230,7 @@ void ParallelBoostContext::suspend() next_context = static_cast(next_work.get()->context_); } else { XBT_DEBUG("No more processes to run"); - uintptr_t worker_id = reinterpret_cast(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); @@ -242,11 +239,10 @@ void ParallelBoostContext::suspend() 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(worker_id)); + worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); ParallelBoostContext* worker_context = static_cast(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); diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp index 1a9ae4ee26..899de64b4b 100644 --- a/src/kernel/context/ContextBoost.hpp +++ b/src/kernel/context/ContextBoost.hpp @@ -98,7 +98,7 @@ private: static simgrid::xbt::Parmap* parmap_; static std::vector workers_context_; static std::atomic threads_working_; - static xbt_os_thread_key_t worker_id_key_; + static thread_local uintptr_t worker_id_; }; #endif diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 09d0c3ebc2..f76faf604c 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -328,7 +328,7 @@ void SerialRawContext::run_all() simgrid::xbt::Parmap* ParallelRawContext::parmap_; std::atomic 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::workers_context_; /* space to save the worker context in each thread */ @@ -337,7 +337,6 @@ void ParallelRawContext::initialize() parmap_ = nullptr; workers_context_.clear(); workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - xbt_os_thread_key_create(&worker_id_key_); } void ParallelRawContext::finalize() @@ -345,7 +344,6 @@ void ParallelRawContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelRawContext::run_all() @@ -373,9 +371,8 @@ void ParallelRawContext::suspend() } else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); - uintptr_t worker_id = reinterpret_cast(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); @@ -384,11 +381,10 @@ void ParallelRawContext::suspend() 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(worker_id)); + worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); ParallelRawContext* worker_context = static_cast(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); } diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp index 6996280d5e..d7d48eb8f8 100644 --- a/src/kernel/context/ContextRaw.hpp +++ b/src/kernel/context/ContextRaw.hpp @@ -83,7 +83,7 @@ private: static simgrid::xbt::Parmap* parmap_; static std::vector workers_context_; static std::atomic threads_working_; - static xbt_os_thread_key_t worker_id_key_; + static uintptr_t thread_local worker_id_; }; #endif diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index 51813a4743..3e98fc7ab6 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -201,7 +201,7 @@ void SerialUContext::run_all() simgrid::xbt::Parmap* ParallelUContext::parmap_; std::atomic 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::workers_context_; /* space to save the worker's context * in each thread */ @@ -210,7 +210,6 @@ void ParallelUContext::initialize() parmap_ = nullptr; workers_context_.clear(); workers_context_.resize(SIMIX_context_get_nthreads(), nullptr); - xbt_os_thread_key_create(&worker_id_key_); } void ParallelUContext::finalize() @@ -218,7 +217,6 @@ void ParallelUContext::finalize() delete parmap_; parmap_ = nullptr; workers_context_.clear(); - xbt_os_thread_key_destroy(worker_id_key_); } void ParallelUContext::run_all() @@ -259,10 +257,9 @@ void ParallelUContext::suspend() } 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(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 } @@ -274,14 +271,12 @@ void ParallelUContext::suspend() /** 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(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(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: diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp index 2ee74ad427..1f9de414f7 100644 --- a/src/kernel/context/ContextUnix.hpp +++ b/src/kernel/context/ContextUnix.hpp @@ -85,7 +85,7 @@ private: static simgrid::xbt::Parmap* parmap_; static std::vector workers_context_; static std::atomic threads_working_; - static xbt_os_thread_key_t worker_id_key_; + static thread_local uintptr_t worker_id_; }; #endif