From patchwork Wed Jun 3 18:34:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 39461 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89B77388C032; Wed, 3 Jun 2020 18:35:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89B77388C032 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591209302; bh=s1NsXvkyE5mV/8GuzkH7/KorPh4TCXE7ECM2WjZ8ccc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=HXtIZZSgMoemARN+p+sEVVjxYFAh8rdWu0QVpnW4rzxRiiEtPi4JJJN83w2McLeAt H4lj9ae7W894pGkgnA9KM5qDH02nux10MUg9eXAft8BULB1mk3+Gp0cfJzrWd7S4I8 GumRacTv/M8QS2+beKWHSTCn1+PqcTqNbcbiKHug= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 63806388C023 for ; Wed, 3 Jun 2020 18:35:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 63806388C023 Received: by mail-qk1-x744.google.com with SMTP id c185so3229628qke.7 for ; Wed, 03 Jun 2020 11:35:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s1NsXvkyE5mV/8GuzkH7/KorPh4TCXE7ECM2WjZ8ccc=; b=fGlRbN6SOYL6QnXw7Goxqg1h+ED7nBhoz1+QiBYeuDD9OHSoY8zUG1lGLkELJYmNqu 5SAUHt1+X3buzP8Qr568vnQGyKKFsLpnAer1uKQas74zP0MU1o0fJwJktSsv0+VBDEuE /TYBw59GHeHX28DleRw/jt74nNLINj6c0jwJmvCDSmFONmjzWCn1gnVbEB3EQjJskE67 /Z9OqabhmyDmnJX7o3KSuFCuIGTjfh9sMQvN+mzpabL6ywfLa13DTX8FMUeE83rOcvs/ hKPQ4WgH/mRdDF1YSG9IrXKpZlMIpE1vuW9XRdNCmPAVprd4LsnOgYg9jPMZTkkOJj7N M0Tw== X-Gm-Message-State: AOAM532aRWd5fLWX7PeMwShV3pW6Lj4/HK5kSmuAES4Cd0za3I9RmPjQ 304CcLMYrwNrKxWb8JHBz3Cje2xivRw= X-Google-Smtp-Source: ABdhPJxz6aPeS0igzAf5Bmk5v/PzI1uiY8ObrmMU0kzDcleZwVsnfFXHHePSfjA5ue3ygJujxFnFcw== X-Received: by 2002:a37:a111:: with SMTP id k17mr1034945qke.376.1591209299564; Wed, 03 Jun 2020 11:34:59 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z77sm1507361qka.59.2020.06.03.11.34.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 11:34:59 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 07/13] string: Use tls-internal on strerror_l Date: Wed, 3 Jun 2020 15:34:38 -0300 Message-Id: <20200603183444.587742-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200603183444.587742-1-adhemerval.zanella@linaro.org> References: <20200603183444.587742-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-15.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The buffer allocation uses the same strategy of strsignal. Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. --- include/string.h | 3 --- malloc/thread-freeres.c | 1 - string/strerror_l.c | 21 +++++------------ sysdeps/generic/tls-internal-struct.h | 1 + sysdeps/generic/tls-internal.h | 1 + sysdeps/mach/strerror_l.c | 32 +++++++++----------------- sysdeps/unix/sysv/linux/tls-internal.h | 1 + 7 files changed, 20 insertions(+), 40 deletions(-) diff --git a/include/string.h b/include/string.h index 3a33327cc0..ce01ad8254 100644 --- a/include/string.h +++ b/include/string.h @@ -53,9 +53,6 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); extern char *__strerror_l (int __errnum, locale_t __loc); -/* Called as part of the thread shutdown sequence. */ -void __strerror_thread_freeres (void) attribute_hidden; - /* Get _STRING_ARCH_unaligned. */ #include #endif diff --git a/malloc/thread-freeres.c b/malloc/thread-freeres.c index 3408bdbefd..eb29d53310 100644 --- a/malloc/thread-freeres.c +++ b/malloc/thread-freeres.c @@ -32,7 +32,6 @@ __libc_thread_freeres (void) { call_function_static_weak (__rpc_thread_destroy); call_function_static_weak (__res_thread_freeres); - call_function_static_weak (__strerror_thread_freeres); __glibc_tls_internal_free (); /* This should come last because it shuts down malloc for this diff --git a/string/strerror_l.c b/string/strerror_l.c index 017bd14b99..a203e9e80b 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -18,11 +18,8 @@ #include #include #include -#include #include -#include - -static __thread char *last_value; +#include static const char * @@ -43,12 +40,13 @@ __strerror_l (int errnum, locale_t loc) char *err = (char *) __get_errlist (errnum); if (__glibc_unlikely (err == NULL)) { - free (last_value); - if (__asprintf (&last_value, "%s%d", + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strerror_l_buf); + if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", translate ("Unknown error ", loc), errnum) == -1) - last_value = NULL; + tls_internal->strerror_l_buf = NULL; - err = last_value; + err = tls_internal->strerror_l_buf; } else err = (char *) translate (err, loc); @@ -58,10 +56,3 @@ __strerror_l (int errnum, locale_t loc) } weak_alias (__strerror_l, strerror_l) libc_hidden_def (__strerror_l) - -void -__strerror_thread_freeres (void) -{ - free (last_value); -} -text_set_element (__libc_subfreeres, __strerror_thread_freeres); diff --git a/sysdeps/generic/tls-internal-struct.h b/sysdeps/generic/tls-internal-struct.h index 33a9079ee9..156e722bd8 100644 --- a/sysdeps/generic/tls-internal-struct.h +++ b/sysdeps/generic/tls-internal-struct.h @@ -22,6 +22,7 @@ struct tls_internal_t { char *strsignal_buf; + char *strerror_l_buf; }; #endif diff --git a/sysdeps/generic/tls-internal.h b/sysdeps/generic/tls-internal.h index 1f6a117d76..b4b03b4ecf 100644 --- a/sysdeps/generic/tls-internal.h +++ b/sysdeps/generic/tls-internal.h @@ -34,6 +34,7 @@ static inline void __glibc_tls_internal_free (void) { free (__tls_internal.strsignal_buf); + free (__tls_internal.strerror_l_buf); } #endif diff --git a/sysdeps/mach/strerror_l.c b/sysdeps/mach/strerror_l.c index b6c9fdbe80..72b857f4a0 100644 --- a/sysdeps/mach/strerror_l.c +++ b/sysdeps/mach/strerror_l.c @@ -23,11 +23,7 @@ #include #include #include -#include -#include - - -static __thread char *last_value; +#include static const char * @@ -58,13 +54,14 @@ __strerror_l (int errnum, locale_t loc) if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { - free (last_value); - if (__asprintf (&last_value, "%s%X", + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strerror_l_buf); + if (__asprintf (&tls_internal->strerror_l_buf, "%s%X", translate ("Error in unknown error system: ", loc), errnum) == -1) - last_value = NULL; + tls_internal->strerror_l_buf = NULL; - return last_value; + return tls_internal->strerror_l_buf; } es = &__mach_error_systems[system]; @@ -74,25 +71,18 @@ __strerror_l (int errnum, locale_t loc) if (code >= es->subsystem[sub].max_code) { - free (last_value); - if (__asprintf (&last_value, "%s%s %d", + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strerror_l_buf); + if (__asprintf (&tls_internal->strerror_l_buf, "%s%s %d", translate ("Unknown error ", loc), translate (es->subsystem[sub].subsys_name, loc), errnum) == -1) - last_value = NULL; + tls_internal->strerror_l_buf = NULL; - return last_value; + return tls_internal->strerror_l_buf; } return (char *) translate (es->subsystem[sub].codes[code], loc); } weak_alias (__strerror_l, strerror_l) libc_hidden_def (__strerror_l) - -/* This is called when a thread is exiting to free the last_value string. */ -void -__strerror_thread_freeres (void) -{ - free (last_value); -} -text_set_element (__libc_subfreeres, __strerror_thread_freeres); diff --git a/sysdeps/unix/sysv/linux/tls-internal.h b/sysdeps/unix/sysv/linux/tls-internal.h index 5d712abd4a..d07f4b680d 100644 --- a/sysdeps/unix/sysv/linux/tls-internal.h +++ b/sysdeps/unix/sysv/linux/tls-internal.h @@ -32,6 +32,7 @@ static inline void __glibc_tls_internal_free (void) { free (THREAD_SELF->tls_state.strsignal_buf); + free (THREAD_SELF->tls_state.strerror_l_buf); } #endif