From patchwork Sun Jul 16 08:44:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 1808423 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=ZMMn94dy; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R3f3V0L8Lz20Cs for ; Sun, 16 Jul 2023 18:47:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1921D385C6E3 for ; Sun, 16 Jul 2023 08:47:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1921D385C6E3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689497236; bh=plGnfALp75ovHdvl3iVCt9czYAwI7Kx3VHoDlcakTCk=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ZMMn94dyf/Tm1wTKhc9VSJnImVTRMxTnYYc2jhP06xO+tBF9WgzO0S4eFGOFbS0Pu PVlmsUNkSfDkj4pSMkREJqSm33/O3aVHCmD79k7NdO3hBKoVwEG4uigj/iURCVu3+a 7gxYZJrCG4wDsAC+l9grhZy3EK0hVDgv6SmRq5LE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id ADEC138582A4 for ; Sun, 16 Jul 2023 08:44:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ADEC138582A4 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CE0BE4061F; Sun, 16 Jul 2023 10:44:45 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mc8-QojIc0QV; Sun, 16 Jul 2023 10:44:44 +0200 (CEST) To: libc-alpha@sourceware.org Cc: Guy-Fleury Iteriteka Subject: [PATCH 09/10] htl: move pthread_attr_getdetachstate into libc Date: Sun, 16 Jul 2023 10:44:13 +0200 Message-Id: <20230716084414.107245-10-gfleury@disroot.org> In-Reply-To: <20230716084414.107245-1-gfleury@disroot.org> References: <20230716084414.107245-1-gfleury@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Guy-Fleury Iteriteka --- 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 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index b8809fe8..54ec1da0 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 846cc4f8..c6568384 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 f3f2911f..e1511a8c 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 d6879e00..0b06ef6c 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 68c16476..c665e4cb 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 7f3cae62..3ca0c5d5 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