From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 75150 invoked by alias); 31 Oct 2019 19:44:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 75141 invoked by uid 89); 31 Oct 2019 19:44:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=sk:posixs, sk:posix-s X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 Oct 2019 19:44:54 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id AEDA020266; Thu, 31 Oct 2019 15:44:52 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id A4E6620266; Thu, 31 Oct 2019 15:44:48 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 854F420AF6; Thu, 31 Oct 2019 15:44:48 -0400 (EDT) X-Gerrit-PatchSet: 1 Date: Thu, 31 Oct 2019 19:44:00 -0000 From: "Christian Biesinger (Code Review)" To: gdb-patches@sourceware.org Cc: Christian Biesinger Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Use strerror_r in safe_strerror if available X-Gerrit-Change-Id: I81048fbaf148035c221c528727f7efe58ba528eb X-Gerrit-Change-Number: 474 X-Gerrit-ChangeURL: X-Gerrit-Commit: 158f4b24a83ad0a50aea6d7e1ba64f725c0a3bea References: Reply-To: cbiesinger@google.com, cbiesinger@google.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/3.0.3-75-g9005159e5d Content-Type: text/plain; charset=UTF-8 X-SW-Source: 2019-10/txt/msg01193.txt.bz2 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/474 ...................................................................... Use strerror_r in safe_strerror if available Also stores the result in a thread-local static variable. This is already important because Guile creates threads and Python can create threads, but with the patch series here: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/176 GDB itself will create threads, too. gdb/ChangeLog: 2019-10-31 Christian Biesinger * configure: Regenerate. * configure.ac: Check for strerror_r. * gdbsupport/posix-strerror.c (safe_strerror): Make buf thread_local and call strerror_r, if available. Change-Id: I81048fbaf148035c221c528727f7efe58ba528eb --- M gdb/configure M gdb/configure.ac M gdb/gdbsupport/posix-strerror.c 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gdb/configure b/gdb/configure index e805903..018cc4b 100755 --- a/gdb/configure +++ b/gdb/configure @@ -13073,7 +13073,7 @@ sigaction sigsetmask socketpair \ ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid \ - ptrace64 sigaltstack setns use_default_colors + ptrace64 sigaltstack setns use_default_colors strerror_r do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/gdb/configure.ac b/gdb/configure.ac index 354bb7b..987507a 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1318,7 +1318,7 @@ sigaction sigsetmask socketpair \ ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ setrlimit getrlimit posix_madvise waitpid \ - ptrace64 sigaltstack setns use_default_colors]) + ptrace64 sigaltstack setns use_default_colors strerror_r]) AM_LANGINFO_CODESET GDB_AC_COMMON diff --git a/gdb/gdbsupport/posix-strerror.c b/gdb/gdbsupport/posix-strerror.c index a8651b7..727eb7b 100644 --- a/gdb/gdbsupport/posix-strerror.c +++ b/gdb/gdbsupport/posix-strerror.c @@ -24,12 +24,22 @@ char * safe_strerror (int errnum) { - char *msg; + static thread_local char buf[1024]; + char *msg = nullptr; +#ifdef HAVE_STRERROR_R +#if !__GLIBC__ || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) + /* Glibc has two different, incompatible versions of strerror_r. */ + if (strerror_r (errnum, buf, sizeof (buf)) == 0) + msg = buf; +#else + msg = strerror_r (errnum, buf, sizeof (buf)); +#endif +#else msg = strerror (errnum); - if (msg == NULL) +#endif + if (msg == nullptr) { - static char buf[32]; xsnprintf (buf, sizeof buf, "(undocumented errno %d)", errnum); msg = buf; -- Gerrit-Project: binutils-gdb Gerrit-Branch: master Gerrit-Change-Id: I81048fbaf148035c221c528727f7efe58ba528eb Gerrit-Change-Number: 474 Gerrit-PatchSet: 1 Gerrit-Owner: Christian Biesinger Gerrit-MessageType: newchange