diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-09-26 20:32:36 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2020-09-26 20:32:36 +0100 |
commit | e6923541fae5081b646f240d54de2a32e17a0382 (patch) | |
tree | 3c3af77ca37a9b2f461141e3a08ff459b0963209 /libstdc++-v3/libsupc++ | |
parent | 3991912e260d68f0da8d3711b5258c3a3009dc4c (diff) | |
download | gcc-e6923541fae5081b646f240d54de2a32e17a0382.zip gcc-e6923541fae5081b646f240d54de2a32e17a0382.tar.gz gcc-e6923541fae5081b646f240d54de2a32e17a0382.tar.bz2 |
libstdc++: Use __libc_single_threaded to optimise atomics [PR 96817]
Glibc 2.32 adds a global variable that says whether the process is
single-threaded. We can use this to decide whether to elide atomic
operations, as a more precise and reliable indicator than
__gthread_active_p.
This means that guard variables for statics and reference counting in
shared_ptr can use less expensive, non-atomic ops even in processes that
are linked to libpthread, as long as no threads have been created yet.
It also means that we switch to using atomics if libpthread gets loaded
later via dlopen (this still isn't supported in general, for other
reasons).
We can't use __libc_single_threaded to replace __gthread_active_p
everywhere. If we replaced the uses of __gthread_active_p in std::mutex
then we would elide the pthread_mutex_lock in the code below, but not
the pthread_mutex_unlock:
std::mutex m;
m.lock(); // pthread_mutex_lock
std::thread t([]{}); // __libc_single_threaded = false
t.join();
m.unlock(); // pthread_mutex_unlock
We need the lock and unlock to use the same "is threading enabled"
predicate, and similarly for init/destroy pairs for mutexes and
condition variables, so that we don't try to release resources that were
never acquired.
There are other places that could use __libc_single_threaded, such as
_Sp_locker in src/c++11/shared_ptr.cc and locale init functions, but
they can be changed later.
libstdc++-v3/ChangeLog:
PR libstdc++/96817
* include/ext/atomicity.h (__gnu_cxx::__is_single_threaded()):
New function wrapping __libc_single_threaded if available.
(__exchange_and_add_dispatch, __atomic_add_dispatch): Use it.
* libsupc++/guard.cc (__cxa_guard_acquire, __cxa_guard_abort)
(__cxa_guard_release): Likewise.
* testsuite/18_support/96817.cc: New test.
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r-- | libstdc++-v3/libsupc++/guard.cc | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc index 474af33..240eda8 100644 --- a/libstdc++-v3/libsupc++/guard.cc +++ b/libstdc++-v3/libsupc++/guard.cc @@ -252,7 +252,24 @@ namespace __cxxabiv1 # ifdef _GLIBCXX_USE_FUTEX // If __atomic_* and futex syscall are supported, don't use any global // mutex. - if (__gthread_active_p ()) + + // Use the same bits in the guard variable whether single-threaded or not, + // so that __cxa_guard_release and __cxa_guard_abort match the logic here + // even if __libc_single_threaded becomes false between now and then. + + if (__gnu_cxx::__is_single_threaded()) + { + // No need to use atomics, and no need to wait for other threads. + int *gi = (int *) (void *) g; + if (*gi == 0) + { + *gi = _GLIBCXX_GUARD_PENDING_BIT; + return 1; + } + else + throw_recursive_init_exception(); + } + else { int *gi = (int *) (void *) g; const int guard_bit = _GLIBCXX_GUARD_BIT; @@ -302,7 +319,7 @@ namespace __cxxabiv1 syscall (SYS_futex, gi, _GLIBCXX_FUTEX_WAIT, expected, 0); } } -# else +# else // ! _GLIBCXX_USE_FUTEX if (__gthread_active_p ()) { mutex_wrapper mw; @@ -340,18 +357,26 @@ namespace __cxxabiv1 } } # endif -#endif +#endif // ! __GTHREADS return acquire (g); } extern "C" - void __cxa_guard_abort (__guard *g) throw () + void __cxa_guard_abort (__guard *g) noexcept { #ifdef _GLIBCXX_USE_FUTEX // If __atomic_* and futex syscall are supported, don't use any global // mutex. - if (__gthread_active_p ()) + + if (__gnu_cxx::__is_single_threaded()) + { + // No need to use atomics, and no other threads to wake. + int *gi = (int *) (void *) g; + *gi = 0; + return; + } + else { int *gi = (int *) (void *) g; const int waiting_bit = _GLIBCXX_GUARD_WAITING_BIT; @@ -385,12 +410,19 @@ namespace __cxxabiv1 } extern "C" - void __cxa_guard_release (__guard *g) throw () + void __cxa_guard_release (__guard *g) noexcept { #ifdef _GLIBCXX_USE_FUTEX // If __atomic_* and futex syscall are supported, don't use any global // mutex. - if (__gthread_active_p ()) + + if (__gnu_cxx::__is_single_threaded()) + { + int *gi = (int *) (void *) g; + *gi = _GLIBCXX_GUARD_BIT; + return; + } + else { int *gi = (int *) (void *) g; const int guard_bit = _GLIBCXX_GUARD_BIT; @@ -401,6 +433,7 @@ namespace __cxxabiv1 syscall (SYS_futex, gi, _GLIBCXX_FUTEX_WAKE, INT_MAX); return; } + #elif defined(__GTHREAD_HAS_COND) if (__gthread_active_p()) { |