From patchwork Wed May 13 20:26:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 39241 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 3DAD13959C9D; Wed, 13 May 2020 20:26:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DAD13959C9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1589401605; bh=BEYj6xZPD8mCKBU9QHp4F6EeDlRcYTm2uiO7Snmu/YI=; 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=HNY3OyBjfCB3TamNXt97KiyOD+enMHCf19+So0SoNoTlPuxtTYAUvHxF/N8JIRGJs maRWlEnMcyGKT/6YeDBbYgWYx7U+KSry6SsIPiB1VVEjnG1IrJo2cVqYXCFT2om0Sl n70RAx5oznQ4x/fMPM9d0iKWnNn+bdt+0DgqTIEw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by sourceware.org (Postfix) with ESMTPS id EF71E3945C1B for ; Wed, 13 May 2020 20:26:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EF71E3945C1B Received: by mail-qk1-x734.google.com with SMTP id n14so729832qke.8 for ; Wed, 13 May 2020 13:26:41 -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=BEYj6xZPD8mCKBU9QHp4F6EeDlRcYTm2uiO7Snmu/YI=; b=AkTAOH1gW3ROuZwscjFOkjcJSm1VV/rUSpkw07OX6+23Hz3Of0uS5bzUMNdENFnZHO YXkWjrNxsjPYNvZjODZlLk4Mh401IuwMkB7McahRZoVulvazeKzAPgowzVSx7FNWdc6c EScSwBvbWUIhVVMncMamAjMkMT56ZYvnr43ja7a37clqgAqgUJnpD8Jxpmwrp0qJW2AF RIvhav3XgUGPydvPBZmGniu04AqUQg9qw2v8UqnWpMUPpjmS+H6zFIm8XWtm7f67JOyx D/OF+Kh8T9zcqRfUxuXUOlzOdnyBm85ulNhZhG5g+Ny6tpWRhBeCKLN+XFOb3vpB/aRF cquw== X-Gm-Message-State: AOAM533+CvXPW60RI6CQ7L0hWI4dMvK8oy5vxrh2/KSAn12Y0YzjIOnQ EXNb21VepbD/NELMVt/OkzINRV4Dkec= X-Google-Smtp-Source: ABdhPJyGqQUTfCpQc6w+siSOWogJCPMPjYNmxWvQ3iVUzTCo2xmWucr4t46caa9m15PlcL/jsz/pCw== X-Received: by 2002:a05:620a:1366:: with SMTP id d6mr1572945qkl.114.1589401601157; Wed, 13 May 2020 13:26:41 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 62sm806465qkh.113.2020.05.13.13.26.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 13:26:40 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [RFC 4/4] string: Move strerror_l pointer to tls_internal.h Date: Wed, 13 May 2020 17:26:30 -0300 Message-Id: <20200513202630.2123238-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200513202630.2123238-1-adhemerval.zanella@linaro.org> References: <20200513202630.2123238-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, UNWANTED_LANGUAGE_BODY 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" Similar to strsignal_l, move the per-thread message pointer to tls_internal.h (which on Linux is allocated on struct per-thread). Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. --- string/strerror_l.c | 34 ++++++++++++--------------- sysdeps/generic/tls_internal-struct.h | 1 + sysdeps/mach/strerror_l.c | 24 +++++++++---------- 3 files changed, 27 insertions(+), 32 deletions(-) diff --git a/string/strerror_l.c b/string/strerror_l.c index 40e7d0e896..baa489dd90 100644 --- a/string/strerror_l.c +++ b/string/strerror_l.c @@ -15,15 +15,11 @@ License along with the GNU C Library; if not, see . */ +#include #include #include -#include -#include #include -#include -#include - -static __thread char *last_value; +#include static const char * @@ -40,23 +36,23 @@ translate (const char *str, locale_t loc) char * strerror_l (int errnum, locale_t loc) { - if (__glibc_unlikely (errnum < 0 || errnum >= _sys_nerr_internal - || _sys_errlist_internal[errnum] == NULL)) - { - free (last_value); - if (__asprintf (&last_value, "%s%d", - translate ("Unknown error ", loc), errnum) == -1) - last_value = NULL; - - return last_value; - } - - return (char *) translate (_sys_errlist_internal[errnum], loc); + char *r = __strerror_lookup (errnum); + if (r != NULL) + return (char *) translate (r, loc); + + 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) + tls_internal->strerror_l_buf = NULL; + + return tls_internal->strerror_l_buf; } void __strerror_thread_freeres (void) { - free (last_value); + free (__glibc_tls_internal()->strerror_l_buf); } 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 4416228757..a5ae278f81 100644 --- a/sysdeps/generic/tls_internal-struct.h +++ b/sysdeps/generic/tls_internal-struct.h @@ -30,6 +30,7 @@ struct tls_internal_t char strsignal_buf[strsignal_str_len + INT_STRLEN_BOUND (int) + 1]; char *strsignal_l_buf; char strerror_buf[strerror_str_len + INT_STRLEN_BOUND (int) + 1]; + char *strerror_l_buf; }; #define TLS_INTERNAL_STRERROR_LEN \ diff --git a/sysdeps/mach/strerror_l.c b/sysdeps/mach/strerror_l.c index f514af341e..d6a69c3784 100644 --- a/sysdeps/mach/strerror_l.c +++ b/sysdeps/mach/strerror_l.c @@ -24,10 +24,7 @@ #include #include #include -#include - - -static __thread char *last_value; +#include static const char * @@ -56,15 +53,16 @@ strerror_l (int errnum, locale_t loc) sub = err_get_sub (errnum); code = err_get_code (errnum); + struct tls_internal_t *tls_internal = __glibc_tls_internal (); if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { - free (last_value); - if (__asprintf (&last_value, "%s%X", + 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,14 +72,14 @@ strerror_l (int errnum, locale_t loc) if (code >= es->subsystem[sub].max_code) { - free (last_value); - if (__asprintf (&last_value, "%s%s %d", + 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); @@ -91,6 +89,6 @@ strerror_l (int errnum, locale_t loc) void __strerror_thread_freeres (void) { - free (last_value); + free (__glibc_tls_internal()->strerror_l_buf); } text_set_element (__libc_subfreeres, __strerror_thread_freeres);