From patchwork Sat Oct 29 12:00:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59627 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 930A13858427 for ; Sat, 29 Oct 2022 16:16:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 930A13858427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060200; bh=mEdJS8CqCPYsVRvkmwj0QoRdXo2Tunuz1YhB0r+9fh4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=vxou4pz0nW8QmWd45gdm1BvOgFxnqLqmg95X7gC8iRrf1BAMEcQMbLMqNfqYjtMv/ lkpVyRTqbysTAud9hm7yrkymfP3dXdZGsHrY13NGBSiCrlo4sdQMSzgUYhrj5K23Fh U9FlD/PhbZe0m/4WrHU4AAin17QGcOuZ/j7nERm0= 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 C80D73858C78 for ; Sat, 29 Oct 2022 16:16:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C80D73858C78 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AB3A2409ED; Sat, 29 Oct 2022 18:16:08 +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 gKY-P4hCSv_j; Sat, 29 Oct 2022 18:16:07 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 1/4] htl: move __pthread-total into libc. Date: Sat, 29 Oct 2022 13:00:27 +0100 Message-Id: <20221029120030.1448-2-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" * htl/Makefile(routine): add pt-total. htl/Versions(libc[PRIVATE]): add __pthread-total. htl/pt-create.c(__pthread-total): remove it htl/pt-total.c: New file. htl/pt-total.c(__pthread-total): move definition here. htl/pt-internal(__pthread-total): add to it libc_hidden_proto proprerty. --- htl/Makefile | 2 +- htl/Versions | 1 + htl/pt-create.c | 6 ------ htl/pt-internal.h | 1 + htl/pt-total.c | 23 +++++++++++++++++++++++ 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 htl/pt-total.c diff --git a/htl/Makefile b/htl/Makefile index 0b403e2f..ad0e2645 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -164,7 +164,7 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 4e0ebac2..113110f4 100644 --- a/htl/Versions +++ b/htl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; __libc_pthread_init; __pthread_cleanup_stack; + __pthread_total; } } diff --git a/htl/pt-create.c b/htl/pt-create.c index 5d37edbb..34a63b6a 100644 --- a/htl/pt-create.c +++ b/htl/pt-create.c @@ -36,12 +36,6 @@ # include #endif -/* The total number of pthreads currently active. This is defined - here since it would be really stupid to have a threads-using - program that doesn't call `pthread_create'. */ -unsigned int __pthread_total; - - /* The entry-point for new threads. */ static void entry_point (struct __pthread *self, void *(*start_routine) (void *), void *arg) diff --git a/htl/pt-internal.h b/htl/pt-internal.h index f01cb7ce..b787acf8 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -165,6 +165,7 @@ __pthread_dequeue (struct __pthread *thread) /* The total number of threads currently active. */ extern unsigned int __pthread_total; +libc_hidden_proto (__pthread_total) /* Concurrency hint. */ extern int __pthread_concurrency; diff --git a/htl/pt-total.c b/htl/pt-total.c new file mode 100644 index 00000000..8188131c --- /dev/null +++ b/htl/pt-total.c @@ -0,0 +1,23 @@ +/* Thread counter variable. + Copyright (C) 2021-2022 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 + +/* Number of threads running. */ +unsigned int __pthread_total; +libc_hidden_data_def (__pthread_total) From patchwork Sat Oct 29 12:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59628 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 5ACC33858431 for ; Sat, 29 Oct 2022 16:16:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5ACC33858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060203; bh=4MEiK92JDbQZdLz8jyiE1y0p8KRPbdKToIZgVbduq4w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gZ02998WcBLedPqGeJNoEKEjMUfa4x45IbNnYT9tCUs6WnVRnCBn9GDOON78OGr8S vMIyuDkUWpVKXbTd2WIvDANKrbSAna3mcsXec/+FiWDv3ZAB955rc5njI+Y0jyvsj2 H0DKnfeUwpdc8T5gjbxwo4J6nuSDg0FzhfvyC5LU= 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 512A53858402 for ; Sat, 29 Oct 2022 16:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 512A53858402 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 016F340A2D; Sat, 29 Oct 2022 18:16:12 +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 2wvqo0PsVWBx; Sat, 29 Oct 2022 18:16:10 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 2/4] htl: move ___pthread_self to libc Date: Sat, 29 Oct 2022 13:00:28 +0100 Message-Id: <20221029120030.1448-3-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" htl/Makefile(routine): add pt-dep-self htl/Versions(___pthread_self): add to libc symbol sysdeps/mach/hurd/htl/pt-dep-self.c: New file sysdeps/mach/hurd/htl/pt-sysdep.c(___pthread_seld): remove definition. sysdeps/mach/hurd/htl/pt-sysdep.h(___pthread_self): add hidden property --- htl/Makefile | 3 ++- htl/Versions | 1 + sysdeps/mach/hurd/htl/pt-dep-self.c | 22 ++++++++++++++++++++++ sysdeps/mach/hurd/htl/pt-sysdep.c | 2 +- sysdeps/mach/hurd/htl/pt-sysdep.h | 3 +++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 sysdeps/mach/hurd/htl/pt-dep-self.c diff --git a/htl/Makefile b/htl/Makefile index ad0e2645..72e37fbd 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -164,7 +164,8 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ + pt-dep-self shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 113110f4..9ec84811 100644 --- a/htl/Versions +++ b/htl/Versions @@ -31,6 +31,7 @@ libc { __libc_pthread_init; __pthread_cleanup_stack; __pthread_total; + ___pthread_self; } } diff --git a/sysdeps/mach/hurd/htl/pt-dep-self.c b/sysdeps/mach/hurd/htl/pt-dep-self.c new file mode 100644 index 00000000..82cb0524 --- /dev/null +++ b/sysdeps/mach/hurd/htl/pt-dep-self.c @@ -0,0 +1,22 @@ +/* Thread counter variable. + Copyright (C) 2021-2022 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 "pt-sysdep.h" + +__thread struct __pthread *___pthread_self; +libc_hidden_tls_def (___pthread_self) diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c index 2d828545..3597166d 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -26,7 +26,7 @@ #include #include -__thread struct __pthread *___pthread_self; +#include "pt-sysdep.h" static void reset_pthread_total (void) diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h index 854c365c..b28c60d0 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.h +++ b/sysdeps/mach/hurd/htl/pt-sysdep.h @@ -20,6 +20,7 @@ #define _PT_SYSDEP_H 1 #include +#include /* XXX */ #define _POSIX_THREAD_THREADS_MAX 64 @@ -32,6 +33,8 @@ mach_msg_header_t wakeupmsg; extern __thread struct __pthread *___pthread_self; +libc_hidden_tls_proto (___pthread_self) + #ifdef DEBUG #define _pthread_self() \ ({ \ From patchwork Sat Oct 29 12:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59629 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 EA7843858005 for ; Sat, 29 Oct 2022 16:17:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA7843858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060246; bh=iVTRqLyeq50ZRwyyY5sUAb45WByIqaMGKJvJBlu30Gk=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kIni055y4WK+8/F4hsWPB8cxMnPDVYMDMttSm1yjNYDmmLtytys63tsLqR6Ea3yWT mAUSDJGGdYdkrm5/P6/1628m6p0UA9kbCT0+xyLwi0sbxslzMEBLXioEpyekjQMgmp /kXoFXpyRJLfF67R5Lyjuly2A5YXnQz14fchgKbY= 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 E965B385841E for ; Sat, 29 Oct 2022 16:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E965B385841E Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B5E3D40B23; Sat, 29 Oct 2022 18:16:12 +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 AOWCfpP_q1yT; Sat, 29 Oct 2022 18:16:11 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 3/4] htl: move pthread_equal into libc Date: Sat, 29 Oct 2022 13:00:29 +0100 Message-Id: <20221029120030.1448-4-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- htl/Makefile | 3 +-- htl/Versions | 2 +- htl/forward.c | 4 ---- htl/pt-initialize.c | 1 - sysdeps/htl/pthread-functions.h | 2 -- sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/libpthread.abilist | 1 - 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 72e37fbd..a7b013ec 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -46,7 +46,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-alloc \ pt-create \ pt-getattr \ - pt-equal \ pt-dealloc \ pt-detach \ pt-exit \ @@ -165,7 +164,7 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ - pt-dep-self + pt-dep-self pt-equal shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 9ec84811..1ef8a6d0 100644 --- a/htl/Versions +++ b/htl/Versions @@ -83,7 +83,7 @@ libpthread { pthread_condattr_getpshared; pthread_condattr_init; pthread_condattr_setclock; pthread_condattr_setpshared; - pthread_create; pthread_detach; pthread_equal; pthread_exit; + pthread_create; pthread_detach; pthread_exit; pthread_getattr_np; diff --git a/htl/forward.c b/htl/forward.c index 00527348..d0f775a2 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -102,10 +102,6 @@ FORWARD (pthread_cond_timedwait, (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime), (cond, mutex, abstime), 0) -FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), - (thread1, thread2), 1) - - /* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 02e6ad6b..1d948c40 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -47,7 +47,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_cond_signal = __pthread_cond_signal, .ptr_pthread_cond_wait = __pthread_cond_wait, .ptr_pthread_cond_timedwait = __pthread_cond_timedwait, - .ptr_pthread_equal = __pthread_equal, .ptr___pthread_exit = __pthread_exit, .ptr_pthread_getschedparam = __pthread_getschedparam, .ptr_pthread_setschedparam = __pthread_setschedparam, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index ccccc8e5..095a61e6 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -45,7 +45,6 @@ int __pthread_cond_signal (pthread_cond_t *); int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *); int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *, const struct timespec *); -int __pthread_equal (pthread_t, pthread_t); void __pthread_exit (void *) __attribute__ ((__noreturn__)); int __pthread_getschedparam (pthread_t, int *, struct sched_param *); int __pthread_setschedparam (pthread_t, int, @@ -101,7 +100,6 @@ struct pthread_functions int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *); int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *, const struct timespec *); - int (*ptr_pthread_equal) (pthread_t, pthread_t); void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__)); int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *); int (*ptr_pthread_setschedparam) (pthread_t, int, diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 4e3200ef..26552958 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -28,6 +28,7 @@ GLIBC_2.11 mkostemps F GLIBC_2.11 mkostemps64 F GLIBC_2.11 mkstemps F GLIBC_2.11 mkstemps64 F +GLIBC_2.12 pthread_equal F GLIBC_2.13 __fentry__ F GLIBC_2.14 syncfs F GLIBC_2.15 __fdelt_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index b9c9b75c..84f2643b 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -65,7 +65,6 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_detach F -GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_exit F GLIBC_2.12 pthread_getattr_np F GLIBC_2.12 pthread_getconcurrency F From patchwork Sat Oct 29 12:00:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59630 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 08C0938582BF for ; Sat, 29 Oct 2022 16:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08C0938582BF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060249; bh=v8ac1FgFc6d29rgPPd+PoeecyZ11rStYG3jOTMHxR1o=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=nbh/izHyEV/8hi2mBQEikn9ewUTrymKRgYhXIZq17vDpjNUQ694gfJScZIR3lyy46 sHien0L2E255HKPvuDftLn6muonPa/QlYNMwGRZ09GJTFTTAV/KqEIeWON7wRe1t0t Fq78OOrdSIOdJzX+WT72jy15+mBdYVluKzqp93es= 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 C74083858401 for ; Sat, 29 Oct 2022 16:16:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C74083858401 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9090E40795; Sat, 29 Oct 2022 18:16:14 +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 BGZQ74OLJWr5; Sat, 29 Oct 2022 18:16:13 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 4/4] htl: move pthread_self into libc Date: Sat, 29 Oct 2022 13:00:30 +0100 Message-Id: <20221029120030.1448-5-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, 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: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- htl/Makefile | 3 +-- htl/Versions | 7 +++---- htl/forward.c | 4 ---- htl/pt-initialize.c | 1 - sysdeps/htl/pthread-functions.h | 2 -- sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/libpthread.abilist | 1 - 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index a7b013ec..57bb22a2 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -51,7 +51,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-exit \ pt-initialize \ pt-join \ - pt-self \ pt-sigmask \ pt-spin-inlines \ pt-cleanup \ @@ -164,7 +163,7 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ - pt-dep-self pt-equal + pt-dep-self pt-equal pt-self shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 1ef8a6d0..59070181 100644 --- a/htl/Versions +++ b/htl/Versions @@ -25,7 +25,9 @@ libc { GLIBC_2.32 { thrd_current; thrd_equal; thrd_sleep; thrd_yield; } - + GLIBC_2.36 { + __pthread_self; + } GLIBC_PRIVATE { __libc_alloca_cutoff; __libc_pthread_init; @@ -119,9 +121,6 @@ libpthread { pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setpshared; - pthread_self; - __pthread_self; - pthread_setcancelstate; pthread_setcanceltype; pthread_setconcurrency; pthread_setschedparam; pthread_setschedprio; pthread_setspecific; diff --git a/htl/forward.c b/htl/forward.c index d0f775a2..41985f14 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -126,10 +126,6 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) - -FORWARD2 (pthread_self, pthread_t, (void), (), return 0) - - FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), 0) strong_alias (__pthread_setcancelstate, pthread_setcancelstate); diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 1d948c40..225736fe 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -55,7 +55,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_mutex_lock = __pthread_mutex_lock, .ptr_pthread_mutex_trylock = __pthread_mutex_trylock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, - .ptr_pthread_self = __pthread_self, .ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 095a61e6..4d9896ea 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -55,7 +55,6 @@ int _pthread_mutex_init (pthread_mutex_t *, int __pthread_mutex_lock (pthread_mutex_t *); int __pthread_mutex_trylock (pthread_mutex_t *); int __pthread_mutex_unlock (pthread_mutex_t *); -pthread_t __pthread_self (void); int __pthread_setcancelstate (int, int *); int __pthread_setcanceltype (int, int *); struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); @@ -110,7 +109,6 @@ struct pthread_functions int (*ptr_pthread_mutex_lock) (pthread_mutex_t *); int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *); int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *); - pthread_t (*ptr_pthread_self) (void); int (*ptr___pthread_setcancelstate) (int, int *); int (*ptr_pthread_setcanceltype) (int, int *); struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 26552958..bfa47282 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -29,6 +29,7 @@ GLIBC_2.11 mkostemps64 F GLIBC_2.11 mkstemps F GLIBC_2.11 mkstemps64 F GLIBC_2.12 pthread_equal F +GLIBC_2.12 pthread_self F GLIBC_2.13 __fentry__ F GLIBC_2.14 syncfs F GLIBC_2.15 __fdelt_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 84f2643b..d15ba070 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -108,7 +108,6 @@ GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_init F GLIBC_2.12 pthread_rwlockattr_setpshared F -GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setcancelstate F GLIBC_2.12 pthread_setcanceltype F GLIBC_2.12 pthread_setconcurrency F