From patchwork Wed Aug 23 23:55:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1825039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RWNQx5tbXz1yZs for ; Thu, 24 Aug 2023 09:56:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DB94F3830B5A for ; Wed, 23 Aug 2023 23:56:23 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id CAC87385C6ED for ; Wed, 23 Aug 2023 23:55:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAC87385C6ED Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 3D7692010B; Thu, 24 Aug 2023 01:55:50 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id euc2b_HhrFF5; Thu, 24 Aug 2023 01:55:50 +0200 (CEST) Received: from begin (apoitiers-658-1-118-253.w92-162.abo.wanadoo.fr [92.162.65.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 122AE2012F; Thu, 24 Aug 2023 01:55:49 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1qYxhU-00EEGh-0U; Thu, 24 Aug 2023 01:55:48 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: commit-hurd@gnu.org, Guy-Fleury Iteriteka Subject: [hurd, commited 09/10] htl: move pthread_attr_getdetachstate into libc Date: Thu, 24 Aug 2023 01:55:45 +0200 Message-Id: <20230823235546.3391381-10-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230823235546.3391381-1-samuel.thibault@ens-lyon.org> References: <20230823235546.3391381-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" From: Guy-Fleury Iteriteka via Libc-alpha Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230716084414.107245-10-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 2 +- htl/forward.c | 3 --- htl/pt-initialize.c | 1 - sysdeps/htl/pthread-functions.h | 2 -- sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index b8809fe804..54ec1da039 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -24,7 +24,7 @@ SYSDEPS := lockfile LCLHDRS := -libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ +libpthread-routines := pt-attr pt-attr-destroy \ pt-attr-getguardsize \ pt-attr-getscope \ pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ @@ -166,7 +166,7 @@ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \ pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched \ - pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy + pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 846cc4f89e..c656838409 100644 --- a/htl/Versions +++ b/htl/Versions @@ -66,7 +66,7 @@ libpthread { pthread_atfork; - pthread_attr_destroy; pthread_attr_getdetachstate; + pthread_attr_destroy; pthread_attr_getguardsize; pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate; diff --git a/htl/forward.c b/htl/forward.c index f3f2911ff3..e1511a8c59 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -57,9 +57,6 @@ FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0) FORWARD (pthread_attr_init, (pthread_attr_t *attr), (attr), 0) -FORWARD (pthread_attr_getdetachstate, - (const pthread_attr_t *attr, int *detachstate), (attr, detachstate), - 0) FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), (attr, detachstate), 0) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index d6879e005f..0b06ef6c75 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -29,7 +29,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_destroy = __pthread_attr_destroy, .ptr_pthread_attr_init = __pthread_attr_init, - .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getscope = __pthread_attr_getscope, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 68c16476e3..c665e4cb0b 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -23,7 +23,6 @@ int __pthread_attr_destroy (pthread_attr_t *); int __pthread_attr_init (pthread_attr_t *); -int __pthread_attr_getdetachstate (const pthread_attr_t *, int *); int __pthread_attr_setdetachstate (pthread_attr_t *, int); int __pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); @@ -68,7 +67,6 @@ struct pthread_functions { int (*ptr_pthread_attr_destroy) (pthread_attr_t *); int (*ptr_pthread_attr_init) (pthread_attr_t *); - int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *, const struct sched_param *); diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 7f3cae62e1..3ca0c5d52b 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -23,7 +23,6 @@ GLIBC_2.12 ftrylockfile F GLIBC_2.12 funlockfile F GLIBC_2.12 pthread_atfork F GLIBC_2.12 pthread_attr_destroy F -GLIBC_2.12 pthread_attr_getdetachstate F GLIBC_2.12 pthread_attr_getguardsize F GLIBC_2.12 pthread_attr_getscope F GLIBC_2.12 pthread_attr_getstack F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 2c0f0b395f..11ca2fc288 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -40,7 +40,6 @@ GLIBC_2.38 mtx_timedlock F GLIBC_2.38 mtx_trylock F GLIBC_2.38 mtx_unlock F GLIBC_2.38 pthread_attr_destroy F -GLIBC_2.38 pthread_attr_getdetachstate F GLIBC_2.38 pthread_attr_getguardsize F GLIBC_2.38 pthread_attr_getscope F GLIBC_2.38 pthread_attr_getstack F