From patchwork Wed Aug 23 23:55:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1825044 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=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4RWNRY2rvlz1yZs for ; Thu, 24 Aug 2023 09:56:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 707953853556 for ; Wed, 23 Aug 2023 23:56:55 +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 B0462385773F for ; Wed, 23 Aug 2023 23:55:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B0462385773F 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 A7668200FB; Thu, 24 Aug 2023 01:55:49 +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 cWdgkGVC40Qd; Thu, 24 Aug 2023 01:55:49 +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 AE16B2010E; Thu, 24 Aug 2023 01:55:48 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1qYxhU-00EEGS-09; 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 05/10] htl: move pthread_attr_getinheritsched into libc Date: Thu, 24 Aug 2023 01:55:41 +0200 Message-Id: <20230823235546.3391381-6-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-6-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 2 +- htl/forward.c | 2 -- 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(+), 10 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 9e43e571b7..7d705835de 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -25,7 +25,7 @@ SYSDEPS := lockfile LCLHDRS := libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ - pt-attr-getguardsize pt-attr-getinheritsched \ + pt-attr-getguardsize \ pt-attr-getschedpolicy pt-attr-getscope \ pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize \ @@ -165,7 +165,7 @@ headers := \ 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-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index b61fc3f5de..cd1ab1597c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -67,7 +67,7 @@ libpthread { pthread_atfork; pthread_attr_destroy; pthread_attr_getdetachstate; - pthread_attr_getguardsize; pthread_attr_getinheritsched; + pthread_attr_getguardsize; pthread_attr_getschedpolicy; 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 63b5f52275..38b2fcc996 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -63,8 +63,6 @@ FORWARD (pthread_attr_getdetachstate, FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), (attr, detachstate), 0) -FORWARD (pthread_attr_getinheritsched, - (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0) FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit), (attr, inherit), 0) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 427b3124e6..a036aed894 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -31,7 +31,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_init = __pthread_attr_init, .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, - .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index d1cd7a48fa..621b97cf05 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -25,7 +25,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_getinheritsched (const pthread_attr_t *, int *); int __pthread_attr_setinheritsched (pthread_attr_t *, int); int __pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); @@ -74,7 +73,6 @@ struct pthread_functions 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_getinheritsched) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setinheritsched) (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 61fa56d08c..d542029ac4 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -25,7 +25,6 @@ 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_getinheritsched F GLIBC_2.12 pthread_attr_getschedpolicy 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 b7ad05e906..88e3b2de14 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -42,7 +42,6 @@ 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_getinheritsched F GLIBC_2.38 pthread_attr_getschedpolicy F GLIBC_2.38 pthread_attr_getscope F GLIBC_2.38 pthread_attr_getstack F