From patchwork Tue Nov 26 20:53:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 101927 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 205353858019 for ; Tue, 26 Nov 2024 20:59:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 205353858019 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=e1/LSVop X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 993D93858C52 for ; Tue, 26 Nov 2024 20:57:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 993D93858C52 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 993D93858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654647; cv=none; b=c07u7PXfPynq5B60a9F2rf7wAV9v3usm9DPifN7pdkbtFpOiHBIcLRLNWrwIYk3ONQyE4VWGd3iFCU4wxBGvSEAFXg4Byr6ooWQKf49UA1TFbSnmAQw2MrleRRcbTVy4NrTNJjdz37E2jzAVDLYfDPmll8Ph+fsMiEWMeVDBom0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654647; c=relaxed/simple; bh=LUf1tYf1v968MNywpTmb6uR6g6/upQZFN7jX+ZZQ2CI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=OEwRfvOXcS9idjX4oQzKSc1nJiiUHQQYN0sDPLLan20ZQCtKlhMcMb5YZy/5GgAcDQGdfjuSQgDgYsY509aWYP5Y8WqFZoxqTNGgEU1vH9Yudrat61W2IxmIPlPt0wTO8SPcp0Bz+5QJqfpqek5rurnD/n7HNsEUTfa58cAdU9A= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 993D93858C52 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 781C424F0B; Tue, 26 Nov 2024 21:57:26 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id uLPlgIlmQX1v; Tue, 26 Nov 2024 21:57:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1732654645; bh=LUf1tYf1v968MNywpTmb6uR6g6/upQZFN7jX+ZZQ2CI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e1/LSVopHPxCCsTEAi5+8TZKBhJRDiQ8ZvmwOUA3ZZbIPLFAyMwYJ93izFX9nnyo2 E95Lc/mAcZkpQ8MMp8wl9ACNGhE29dr6bQjGiGNdUQT5cleddegOPlqFzaOAnsAash 9R/o+FE3XZ7qgLIzhvwX7kBIDvrZCYS3KU12yWw9MiJliEPCZIq5hrMyXcLW0WX3Mk 1Noxn0fpsUpbnMBF8yFUZ2nBK+zCtnElwLks4aCDrjMf+54B3mR4gEsqxiHDjgC9br WIbVlwo8/g3Yi42q/5/g8aQkdBhPMCoYqfx3RCdGDHlBn/Mu0lspw8LZ/yU1OIkMvk GgF48L9UIsSVw== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 6/7] htl: move pthread_condattr_setclock into libc. Date: Tue, 26 Nov 2024 22:53:28 +0200 Message-Id: <20241126205329.2215295-7-gfleury@disroot.org> In-Reply-To: <20241126205329.2215295-1-gfleury@disroot.org> References: <20241126205329.2215295-1-gfleury@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, 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.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 Signed-off-by: gfleury --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/pt-condattr-setclock.c | 10 ++++++++-- 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, 16 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index e68cf2b5..56424aee 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -92,7 +92,6 @@ libpthread-routines := \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ pt-rwlock-unlock \ - pt-condattr-setclock \ pt-condattr-setpshared \ pt-cond-destroy \ pt-cond-init \ @@ -206,6 +205,7 @@ routines := \ pt-condattr-getclock \ pt-condattr-getpshared \ pt-condattr-init \ + pt-condattr-setclock \ pt-getschedparam \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index 95c8a521..533b871e 100644 --- a/htl/Versions +++ b/htl/Versions @@ -30,6 +30,7 @@ libc { pthread_condattr_init; pthread_condattr_destroy; pthread_condattr_getpshared; + pthread_condattr_setclock; } GLIBC_2.21 { @@ -70,6 +71,7 @@ libc { pthread_attr_setguardsize; pthread_condattr_getclock; pthread_condattr_getpshared; + pthread_condattr_setclock; } @@ -127,7 +129,7 @@ libpthread { pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; - pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_condattr_setpshared; pthread_create; pthread_detach; pthread_exit; diff --git a/sysdeps/htl/pt-condattr-setclock.c b/sysdeps/htl/pt-condattr-setclock.c index d79cc582..33787643 100644 --- a/sysdeps/htl/pt-condattr-setclock.c +++ b/sysdeps/htl/pt-condattr-setclock.c @@ -17,10 +17,11 @@ . */ #include +#include #include int -pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock) +__pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock) { /* Only a few clocks are allowed. CLOCK_REALTIME is always allowed. CLOCK_MONOTONIC only if the kernel has the necessary support. */ @@ -34,7 +35,7 @@ pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock) struct timespec ts; int res; - res = clock_gettime (CLOCK_MONOTONIC, &ts); + res = __clock_gettime (CLOCK_MONOTONIC, &ts); avail = res < 0 ? -1 : 1; } @@ -49,3 +50,8 @@ pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock) return 0; } +versioned_symbol (libc, __pthread_condattr_setclock, pthread_condattr_setclock, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_condattr_setclock, pthread_condattr_setclock, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 1e3e6489..a2cc5742 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -53,6 +53,7 @@ GLIBC_2.12 pthread_condattr_destroy F GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_init F +GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F @@ -2509,6 +2510,7 @@ GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F +GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 6bacf9a4..cd398f2f 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_wait F -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 diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 9a549053..2ff7027d 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1541,6 +1541,7 @@ GLIBC_2.38 pthread_condattr_destroy F GLIBC_2.38 pthread_condattr_getclock F GLIBC_2.38 pthread_condattr_getpshared F GLIBC_2.38 pthread_condattr_init F +GLIBC_2.38 pthread_condattr_setclock F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getschedparam F @@ -2204,6 +2205,7 @@ GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F +GLIBC_2.41 pthread_condattr_setclock F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 35ff3d03..aa8f7802 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_wait F -GLIBC_2.38 pthread_condattr_setclock F GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_detach F