From patchwork Wed Aug 23 23:55:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 74602 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 90DA5382DC54 for ; Wed, 23 Aug 2023 23:58:10 +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 DC298385DC09 for ; Wed, 23 Aug 2023 23:55:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC298385DC09 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 914F220127; 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 Ned_stMX-Q16; 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 3A301200F3; Thu, 24 Aug 2023 01:55:49 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1qYxhU-00EEGm-0Z; 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 10/10] htl: move pthread_attr_setdetachstate into libc Date: Thu, 24 Aug 2023 01:55:46 +0200 Message-Id: <20230823235546.3391381-11-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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" From: Guy-Fleury Iteriteka via Libc-alpha Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230716084414.107245-11-gfleury@disroot.org> --- htl/Makefile | 5 +++-- 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, 4 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 54ec1da039..b32ad830f0 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -28,7 +28,7 @@ libpthread-routines := pt-attr pt-attr-destroy \ pt-attr-getguardsize \ pt-attr-getscope \ pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ - pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize \ + pt-attr-init pt-attr-setguardsize \ pt-attr-setschedparam \ pt-attr-setscope pt-attr-setstack \ pt-attr-setstackaddr pt-attr-setstacksize \ @@ -166,7 +166,8 @@ 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-getdetachstate + pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate \ + pt-attr-setdetachstate shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index c656838409..710051756a 100644 --- a/htl/Versions +++ b/htl/Versions @@ -69,7 +69,7 @@ libpthread { pthread_attr_destroy; pthread_attr_getguardsize; pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr; - pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate; + pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setguardsize; pthread_attr_setschedparam; pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr; diff --git a/htl/forward.c b/htl/forward.c index e1511a8c59..cc8147d6de 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_setdetachstate, (pthread_attr_t *attr, int detachstate), - (attr, detachstate), 0) - FORWARD (pthread_attr_setschedparam, (pthread_attr_t *attr, const struct sched_param *param), (attr, param), 0) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 0b06ef6c75..170e0938f7 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_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getscope = __pthread_attr_getscope, .ptr_pthread_attr_setscope = __pthread_attr_setscope, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index c665e4cb0b..f116434ae1 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_setdetachstate (pthread_attr_t *, int); int __pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); int __pthread_attr_getscope (const pthread_attr_t *, int *); @@ -67,7 +66,6 @@ struct pthread_functions { int (*ptr_pthread_attr_destroy) (pthread_attr_t *); int (*ptr_pthread_attr_init) (pthread_attr_t *); - int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *, const struct sched_param *); int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *); diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 3ca0c5d52b..fa90cc6597 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -29,7 +29,6 @@ GLIBC_2.12 pthread_attr_getstack F GLIBC_2.12 pthread_attr_getstackaddr F GLIBC_2.12 pthread_attr_getstacksize F GLIBC_2.12 pthread_attr_init F -GLIBC_2.12 pthread_attr_setdetachstate F GLIBC_2.12 pthread_attr_setguardsize F GLIBC_2.12 pthread_attr_setschedparam F GLIBC_2.12 pthread_attr_setscope F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 11ca2fc288..80615d16ee 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -46,7 +46,6 @@ GLIBC_2.38 pthread_attr_getstack F GLIBC_2.38 pthread_attr_getstackaddr F GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F -GLIBC_2.38 pthread_attr_setdetachstate F GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_attr_setschedparam F GLIBC_2.38 pthread_attr_setscope F