From patchwork Sat Aug 16 00:13:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 118442 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 C99DF3858C53 for ; Sat, 16 Aug 2025 00:19:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C99DF3858C53 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 0F2943858402 for ; Sat, 16 Aug 2025 00:14:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F2943858402 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 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0F2943858402 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755303261; cv=none; b=JsLyDAUSCWMDr7ld1IgBUlko4auW1FGfkwoqU6bzKKtuH6eMVd87KNzGVJ7fpkfYP8YqNRqIutVRYev7jjHb4m1+Xctu1jQyLbd+Nim0yaCgIu4gPibtBte8NmhmtJNo/OuBd0yToXj5lQdKTIS7u4Om2/bt4sck5WwvliZeViw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755303261; c=relaxed/simple; bh=D72GIWATqvKTW4O23UW+2gmMKLhoey/2L31j/qOopHE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dtvHWP3vDlKkdRBOY6NmOZmv5MJ8lRN87pylTyrjp5oIOWgZw+UAPjyDc/vjyIkqSv8xCH1DdAipfianv4D0bKFORh0Kjs63Io0D2Fe5vgMefX8h2U+OcBjLwmvvxd91A/c0CNBQDJuQ9c1hYZS5/wwvoMrUXGpJcq4m5D9m78s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F2943858402 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id D5886A5E03; Sat, 16 Aug 2025 02:14:07 +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 NKsEVr-eOrTX; Sat, 16 Aug 2025 02:14:07 +0200 (CEST) Received: from begin (165.21.205.77.rev.sfr.net [77.205.21.165]) (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 53065A49C0; Sat, 16 Aug 2025 02:14:07 +0200 (CEST) Received: from samy by begin with local (Exim 4.98.2) (envelope-from ) id 1un4Yg-00000000Wxl-1Vqe; Sat, 16 Aug 2025 02:14:06 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 06/19] htl: move pthread_getcpuclockid into libc. Date: Sat, 16 Aug 2025 02:13:52 +0200 Message-ID: <20250816001405.126154-7-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250816001405.126154-1-samuel.thibault@ens-lyon.org> References: <20250816001405.126154-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, 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.30 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 From: gfleury Message-ID: <20250815181500.107433-7-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 ++-- sysdeps/htl/pt-getcpuclockid.c | 8 +++++++- sysdeps/mach/hurd/i386/libc.abilist | 2 ++ sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index e9fa141193..be7db0ab5d 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,7 +45,6 @@ libpthread-routines := \ pt-spin \ pt-sigstate-init \ pt-kill \ - pt-getcpuclockid \ pt-yield \ pt-getname-np \ pt-setname-np \ @@ -150,6 +149,7 @@ routines := \ pt-dealloc \ pt-destroy-specific \ pt-getconcurrency \ + pt-getcpuclockid \ pt-getschedparam \ pt-getspecific \ pt-init-specific \ diff --git a/htl/Versions b/htl/Versions index c216db4b80..68c7f01ed0 100644 --- a/htl/Versions +++ b/htl/Versions @@ -15,6 +15,7 @@ libc { pthread_equal; pthread_getschedparam; pthread_getspecific; + pthread_getcpuclockid; pthread_setschedparam; pthread_attr_destroy; pthread_attr_getguardsize; @@ -191,6 +192,7 @@ libc { GLIBC_2.43 { pthread_getconcurrency; + pthread_getcpuclockid; pthread_setconcurrency; pthread_setschedprio; } @@ -284,8 +286,6 @@ libpthread { pthread_getattr_np; - pthread_getcpuclockid; - pthread_join; pthread_kill; diff --git a/sysdeps/htl/pt-getcpuclockid.c b/sysdeps/htl/pt-getcpuclockid.c index 0402cef9a4..b37b7b7809 100644 --- a/sysdeps/htl/pt-getcpuclockid.c +++ b/sysdeps/htl/pt-getcpuclockid.c @@ -20,9 +20,10 @@ #include #include +#include int -pthread_getcpuclockid (pthread_t thread, clockid_t *clock) +__pthread_getcpuclockid (pthread_t thread, clockid_t *clock) { #ifdef CLOCK_THREAD_CPUTIME_ID *clock = CLOCK_THREAD_CPUTIME_ID; @@ -33,3 +34,8 @@ pthread_getcpuclockid (pthread_t thread, clockid_t *clock) } stub_warning (pthread_getcpuclockid) +versioned_symbol (libc, __pthread_getcpuclockid, pthread_getcpuclockid, GLIBC_2_43); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43) +compat_symbol (libpthread, __pthread_getcpuclockid, pthread_getcpuclockid, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 90faf89495..791920f257 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -72,6 +72,7 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getconcurrency F +GLIBC_2.12 pthread_getcpuclockid F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_getspecific F GLIBC_2.12 pthread_key_create F @@ -2637,6 +2638,7 @@ GLIBC_2.42 uimaxabs F GLIBC_2.42 ulabs F GLIBC_2.42 ullabs F GLIBC_2.43 pthread_getconcurrency F +GLIBC_2.43 pthread_getcpuclockid F GLIBC_2.43 pthread_setconcurrency F GLIBC_2.43 pthread_setschedprio F GLIBC_2.5 __readlinkat_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 58e46f4e7a..6c9ca8e194 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -25,7 +25,6 @@ GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_detach F GLIBC_2.12 pthread_exit F GLIBC_2.12 pthread_getattr_np F -GLIBC_2.12 pthread_getcpuclockid F GLIBC_2.12 pthread_join F GLIBC_2.12 pthread_kill F GLIBC_2.12 pthread_mutex_transfer_np F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 1d87ec1a8d..0e03d9dc05 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1555,6 +1555,7 @@ GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getconcurrency F +GLIBC_2.38 pthread_getcpuclockid F GLIBC_2.38 pthread_getschedparam F GLIBC_2.38 pthread_getspecific F GLIBC_2.38 pthread_key_create F @@ -2319,6 +2320,7 @@ GLIBC_2.42 uimaxabs F GLIBC_2.42 ulabs F GLIBC_2.42 ullabs F GLIBC_2.43 pthread_getconcurrency F +GLIBC_2.43 pthread_getcpuclockid F GLIBC_2.43 pthread_setconcurrency F GLIBC_2.43 pthread_setschedprio F HURD_CTHREADS_0.3 __cthread_getspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index b40dda87c2..e68935dc5e 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -43,7 +43,6 @@ GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_detach F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getattr_np F -GLIBC_2.38 pthread_getcpuclockid F GLIBC_2.38 pthread_hurd_cond_timedwait_np F GLIBC_2.38 pthread_hurd_cond_wait_np F GLIBC_2.38 pthread_join F