From patchwork Fri Apr 16 09:21:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42996 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 80B70395540B; Fri, 16 Apr 2021 09:21:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80B70395540B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618564883; bh=bKt4vh174VatgQ0/fMY3bWoie4Bg1H0j25u9r0WW6qc=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=s064mAgHj0Cz0qa8Bfwhuqw+oKGEVDjuGk+H1GNUOtcjed5peZCNdL13FBjok2izN 0rG1Jw7CL/xNVwyEev9rfLHA6trJ6ccsRhlavfDsDQC3SlrT4GUlbEUBD+bxjmPnBV IpRQcJaj66IeVRphiyhYNpiXKmgLrSTWjXikkFtU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 7E6493892444 for ; Fri, 16 Apr 2021 09:21:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7E6493892444 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-70-cRscaU89PGeb_1Lh515p2A-1; Fri, 16 Apr 2021 05:21:14 -0400 X-MC-Unique: cRscaU89PGeb_1Lh515p2A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3506F18397A5 for ; Fri, 16 Apr 2021 09:21:13 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E9136E505 for ; Fri, 16 Apr 2021 09:21:12 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v4 13/37] nptl: Move __pthread_keys global variable into libc In-Reply-To: References: Message-Id: <854cfa979e9f1ba6a5135df53f2786bdf0301f08.1618564630.git.fweimer@redhat.com> Date: Fri, 16 Apr 2021 11:21:30 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This prepares moving pthread_exit, and later the pthread_key_create infrastructure. Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 1 + nptl/Versions | 1 + nptl/pthreadP.h | 2 +- nptl/pthread_keys.c | 24 ++++++++++++++++++++++++ nptl/vars.c | 5 ----- nptl_db/structs.def | 2 +- 6 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 nptl/pthread_keys.c diff --git a/nptl/Makefile b/nptl/Makefile index 5bfa721596..ab2c57ad0b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -76,6 +76,7 @@ routines = \ pthread_getaffinity \ pthread_getattr_np \ pthread_getschedparam \ + pthread_keys \ pthread_kill \ pthread_mutex_consistent \ pthread_once \ diff --git a/nptl/Versions b/nptl/Versions index b4ee1bf309..51f8d65bf9 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -119,6 +119,7 @@ libc { __pthread_cond_init; # Used by the C11 threads. __pthread_force_elision; __pthread_getattr_default_np; + __pthread_keys; __pthread_unwind; } } diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 64ec71c23f..c6f95c70a1 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -217,7 +217,7 @@ extern int __concurrency_level attribute_hidden; /* Thread-local data key handling. */ extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]; -hidden_proto (__pthread_keys) +libc_hidden_proto (__pthread_keys) /* Number of threads running. */ extern unsigned int __nptl_nthreads; diff --git a/nptl/pthread_keys.c b/nptl/pthread_keys.c new file mode 100644 index 0000000000..76e4cfad34 --- /dev/null +++ b/nptl/pthread_keys.c @@ -0,0 +1,24 @@ +/* Table of pthread_key_create keys and their destructors. + Copyright (C) 2004-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +/* Table of the key information. */ +struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX] + __attribute__ ((nocommon)); +libc_hidden_data_def (__pthread_keys) diff --git a/nptl/vars.c b/nptl/vars.c index 51de9fbd54..8de30856b8 100644 --- a/nptl/vars.c +++ b/nptl/vars.c @@ -33,8 +33,3 @@ int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER; nptl/descr.h for more context on the single-threaded process case. */ int __pthread_multiple_threads attribute_hidden; #endif - -/* Table of the key information. */ -struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX] - __attribute__ ((nocommon)); -hidden_data_def (__pthread_keys) diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 1522c96f8f..33bf0f9be4 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -82,7 +82,7 @@ DB_MAIN_VARIABLE (__nptl_nthreads) DB_VARIABLE (__nptl_last_event) DB_VARIABLE (__nptl_initial_report_events) -DB_ARRAY_VARIABLE (__pthread_keys) +DB_MAIN_ARRAY_VARIABLE (__pthread_keys) DB_STRUCT (pthread_key_struct) DB_STRUCT_FIELD (pthread_key_struct, seq) DB_STRUCT_FIELD (pthread_key_struct, destr)