public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-6282] [libstdc++] do not destruct mutex_pool mutexes
Date: Wed, 22 Feb 2023 17:39:37 +0000 (GMT)	[thread overview]
Message-ID: <20230222173937.AEA623858288@sourceware.org> (raw)

https://gcc.gnu.org/g:d70f49e98245f80fcf8b2e68a9f06955f52e1de7

commit r13-6282-gd70f49e98245f80fcf8b2e68a9f06955f52e1de7
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Wed Feb 22 14:35:18 2023 -0300

    [libstdc++] do not destruct mutex_pool mutexes
    
    On vxworks, after destroying the semaphore used to implement a mutex,
    __gthread_mutex_lock fails and __gnu_cxx::__mutex::lock calls
    __throw_concurrence_lock_error.  Nothing ensures the mutex_pool
    mutexes survive init-once objects containing _Safe_sequence_base.  If
    such an object completes construction before mutex_pool
    initialization, it will be registered for atexit destruction after the
    mutex_pool mutexes, so the _M_detach_all() call in the
    _Safe_sequence_base dtor will use already-destructed mutexes, and
    basic_string/requirements/citerators_cc fails calling terminate.
    
    This patch fixes this problem by ensuring the mutex pool mutexes are
    constructed on demand, on a statically-allocated buffer, but never
    destructed.
    
    
    for  libstdc++-v3/ChangeLog
    
            * src/c++11/shared_ptr.cc (__gnu_internal::get_mutex):
            Avoid destruction of the mutex pool.

Diff:
---
 libstdc++-v3/src/c++11/shared_ptr.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/src/c++11/shared_ptr.cc b/libstdc++-v3/src/c++11/shared_ptr.cc
index bc70134359c..74e879e5828 100644
--- a/libstdc++-v3/src/c++11/shared_ptr.cc
+++ b/libstdc++-v3/src/c++11/shared_ptr.cc
@@ -36,7 +36,11 @@ namespace __gnu_internal _GLIBCXX_VISIBILITY(hidden)
   {
     // increase alignment to put each lock on a separate cache line
     struct alignas(64) M : __gnu_cxx::__mutex { };
-    static M m[mask + 1];
+    // Use a static buffer, so that the mutexes are not destructed
+    // before potential users (or at all)
+    static __attribute__ ((aligned(__alignof__(M))))
+      char buffer[(sizeof (M)) * (mask + 1)];
+    static M *m = new (buffer) M[mask + 1];
     return m[i];
   }
 }

                 reply	other threads:[~2023-02-22 17:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230222173937.AEA623858288@sourceware.org \
    --to=aoliva@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).