From patchwork Mon Jun 24 17:02:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 167630 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4462234ilk; Mon, 24 Jun 2019 10:02:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNAU3os4IHPr9He3BcTLfmy3QtIOJPK3HpgfW+GUsSKsC/yBsfInkFvZAicxzfjitFA3gX X-Received: by 2002:a63:7ce:: with SMTP id 197mr26582563pgh.320.1561395757906; Mon, 24 Jun 2019 10:02:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561395757; cv=none; d=google.com; s=arc-20160816; b=d76TE+rTFN3r0DyHq4jIo64TA+/qNe2f3PIBWuITL9PX0hgVgc1YncEDYOSGiFdSzr z92Y3/SBIyxiu9rZZ61QSIfZzG3FY21YviCJADaB+ObcUjWo8xgfjyL0Bc1m3RJHcioz 1ssPrivBeCHut9Mw2FynncywxrWfbiArKmV7q6JPg0UucgsefB+6KWUzYhAN6IYe7iX/ hfTYaqAJ1Y5DDbfOfEayQ9+BKG94XuJFEF8y3WfXkbleksIPOErI/5NL0zU0hU9zJluj MGsIKAKNTjdJCcS3wpjacP0YXwgiNLYoT6VWCqm2ElXVnBcMXHqx0a3Fn/+TZevJ141j TG5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:dkim-signature:delivered-to:sender :list-help:list-post:list-archive:list-subscribe:list-unsubscribe :list-id:precedence:mailing-list:dkim-signature:domainkey-signature; bh=9cAGSdLvd5lU4l3Nerjqn8Ildoep7MJAuSo3nKRFmm0=; b=hAndjhRW5o+8Plqjl17I90L0xGbcr0XhFegQFABe0JjtVbH2KhyUgc490x3K+W+gKm 9eDxp3iS5Nh4PP3u5aIvMZ0i0b2FX276I81QtdKo6wIjEOzPJfthaNR30cW0hvQ/JJaV WbD/8rVff3+JtPL6FUqhjRmFBdi3wgVMTUHKLMFpQy7GMsNCkAn7LKwkk5lhxkzBUmj5 8PHMJPM9vLlJ/Tz5NfqMLlGSXevE5nFL01FBVC5QH7HBnktzXdjNL5xOEvigZXzOOaK1 Co/I0eSoSEDdghucPaAHsoDmZiXpDtwBP1lLNa0Jj3qVqEj5BG4XrWV9YVKYqr/OUNDV dN8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VSU7Ydj0; dkim=pass header.i=@linaro.org header.s=google header.b=pnLxrfaX; spf=pass (google.com: domain of libc-alpha-return-102978-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102978-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id p6si5810127plq.30.2019.06.24.10.02.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 10:02:37 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-102978-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=VSU7Ydj0; dkim=pass header.i=@linaro.org header.s=google header.b=pnLxrfaX; spf=pass (google.com: domain of libc-alpha-return-102978-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-102978-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=yIWj9tcsXwpP1aqJegictkpu1E6vrqjflTDq8TOEJwzoff72/rkt4 iouhmkzhr3wki+Ef1exDhgl5YgQfWu/hwI0xILt1BhXgJOyIm3xBFa08leU9eBkM x7Kn85OikK+8SL7iuAa39BheRSqblOHUk56Di6M9Gxypu0kBbAikLg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=/yr/v/UYsswvhPIvmxpt31iRMJ4=; b=VSU7Ydj0lx8RMt4sPLj0knpI1GcR 1bfTFZy7RJaEO1klXuR5SBEo17EevFUAiu/4HA5Gqkfi01PADAk9oiPPsw1fYBnf r21gcl59JgTZ5pcOv6q0MwENXWnuolmhk/MRjeprScyeOQ9Vpv3GOjvwSVzcW0l7 zLDKB+m2gXDwig8= Received: (qmail 70400 invoked by alias); 24 Jun 2019 17:02:27 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 70392 invoked by uid 89); 24 Jun 2019 17:02:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=cancel, 5210, 500000000, 2536 X-HELO: mail-vk1-f182.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=9cAGSdLvd5lU4l3Nerjqn8Ildoep7MJAuSo3nKRFmm0=; b=pnLxrfaXzO0C4+zPpLuFxIu9RbAsCwgwy8dJ9K5rsOx642CVwh7uUmPHY0EsmpysWM dAfCwR8qdzB/gHyZVl4Oxq8Sb3mt3DSJIi6np8gkkBUu0ljsjoRo0qeEmhADkR7U3Bhc To+OyYRLvccgI5t8xOuZeGdtZS4sYzKre6uPYfRfTOygy+YvlSelAjTtIspwBGjdyrCa GNw3X79QcpSs8eAxnBffi0ZOyna5Hvh733/7E8qoAsdDMbbalRbwTUC7rrP4Hg+2gB2K tNYJlv9dmGs97JFQYl5Iw9OhXRTU1jE2QzhGmZQ6QSsCwPxvQhZXQbWNAEPAnI4jlpOk L4Kg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] nptl: Remove cancellation checks from sem_{timed}wait (BZ #23006) Date: Mon, 24 Jun 2019 14:02:16 -0300 Message-Id: <20190624170216.26723-1-adhemerval.zanella@linaro.org> The Austin group has decided that sem_wait and sem_timedwait do not need to be cancellation points. This patch removes the cancellation checks in order to improve performance. As for comment #2 in BZ#23006, the old implementation which explicit check for cancellation is moved to a compat symbol. Checked on x86_64-linux-gnu and i686-linux-gnu. [BZ #23006] * nptl/Version (GLIBC_2.30): Add sem_wait and sem_timedwait. * nptl/sem_timedwait.c (__new_sem_timedwait): New default symbol. (sem_timedwait): Define as __old_sem_timedwait and make compat symbol. * nptl/sem_wait.c (__new_sem_wait): Remove cancellation handling and add new default version. (__old_sem_wait_cancel): New compat symbol. * nptl/tst-cancel12.c (cleanup, tf, do_test): Adapt to check if sem_{timed}wait is not a cancellation entrypoint and use libsupport. * nptl/tst-cancel14.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.30): Add sem_timedwait and sem_wait. * sysdeps/unix/sysv/linux/alpha/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/arm/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/csky/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/hppa/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/i386/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/ia64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/nios2/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/sh/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist: Likewise. [1] http://austingroupbugs.net/view.php?id=1076#c3938 --- ChangeLog | 41 +++++++++ nptl/Versions | 4 + nptl/sem_timedwait.c | 28 +++++- nptl/sem_wait.c | 18 +++- nptl/tst-cancel12.c | 77 ++++------------ nptl/tst-cancel14.c | 92 +++++-------------- .../sysv/linux/aarch64/libpthread.abilist | 2 + .../unix/sysv/linux/alpha/libpthread.abilist | 2 + .../unix/sysv/linux/arm/libpthread.abilist | 2 + .../unix/sysv/linux/csky/libpthread.abilist | 2 + .../unix/sysv/linux/hppa/libpthread.abilist | 2 + .../unix/sysv/linux/i386/libpthread.abilist | 2 + .../unix/sysv/linux/ia64/libpthread.abilist | 2 + .../linux/m68k/coldfire/libpthread.abilist | 2 + .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 + .../sysv/linux/microblaze/libpthread.abilist | 2 + .../sysv/linux/mips/mips32/libpthread.abilist | 2 + .../sysv/linux/mips/mips64/libpthread.abilist | 2 + .../unix/sysv/linux/nios2/libpthread.abilist | 2 + .../powerpc/powerpc32/libpthread.abilist | 2 + .../powerpc/powerpc64/be/libpthread.abilist | 2 + .../powerpc/powerpc64/le/libpthread.abilist | 2 + .../sysv/linux/riscv/rv64/libpthread.abilist | 2 + .../linux/s390/s390-32/libpthread.abilist | 2 + .../linux/s390/s390-64/libpthread.abilist | 2 + sysdeps/unix/sysv/linux/sh/libpthread.abilist | 2 + .../linux/sparc/sparc32/libpthread.abilist | 2 + .../linux/sparc/sparc64/libpthread.abilist | 2 + .../sysv/linux/x86_64/64/libpthread.abilist | 2 + .../sysv/linux/x86_64/x32/libpthread.abilist | 2 + 30 files changed, 175 insertions(+), 133 deletions(-) -- 2.17.1 diff --git a/nptl/Versions b/nptl/Versions index e7f691da7a..08bac575c1 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -277,6 +277,10 @@ libpthread { cnd_timedwait; cnd_wait; tss_create; tss_delete; tss_get; tss_set; } + GLIBC_2.30 { + sem_wait; sem_timedwait; + } + GLIBC_PRIVATE { __pthread_initialize_minimal; __pthread_clock_gettime; __pthread_clock_settime; diff --git a/nptl/sem_timedwait.c b/nptl/sem_timedwait.c index 3dd71ab2fa..48a2a9dd42 100644 --- a/nptl/sem_timedwait.c +++ b/nptl/sem_timedwait.c @@ -17,12 +17,32 @@ License along with the GNU C Library; if not, see . */ -#include "sem_waitcommon.c" - /* This is in a separate file because because sem_timedwait is only provided if __USE_XOPEN2K is defined. */ + +#include "sem_waitcommon.c" + +/* The Austin group has decided that sem_wait() and sem_timedwait() do not + need to be cancellation points: + http://austingroupbugs.net/view.php?id=1076#c3938 */ +int +__new_sem_timedwait (sem_t *sem, const struct timespec *abstime) +{ + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) + { + __set_errno (EINVAL); + return -1; + } + + if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0) + return 0; + return __new_sem_wait_slow((struct new_sem *) sem, abstime); +} +versioned_symbol (libpthread, __new_sem_timedwait, sem_timedwait, GLIBC_2_30); + +#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_30) int -sem_timedwait (sem_t *sem, const struct timespec *abstime) +__old_sem_timedwait (sem_t *sem, const struct timespec *abstime) { if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) { @@ -38,3 +58,5 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime) else return __new_sem_wait_slow((struct new_sem *) sem, abstime); } +compat_symbol (libpthread, __old_sem_timedwait, sem_timedwait, GLIBC_2_2); +#endif diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c index 6a2d26bd1a..a3b3da52d8 100644 --- a/nptl/sem_wait.c +++ b/nptl/sem_wait.c @@ -20,8 +20,21 @@ #include /* lll_futex* used by the old code. */ #include "sem_waitcommon.c" +/* The Austin group has decided that sem_wait() and sem_timedwait() do not + need to be cancellation points: + http://austingroupbugs.net/view.php?id=1076#c3938 */ int __new_sem_wait (sem_t *sem) +{ + if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0) + return 0; + return __new_sem_wait_slow ((struct new_sem *) sem, NULL); +} +versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_30); + +#if SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_30) +int +__old_sem_wait_cancel (sem_t *sem) { /* We need to check whether we need to act upon a cancellation request here because POSIX specifies that cancellation points "shall occur" in @@ -39,9 +52,10 @@ __new_sem_wait (sem_t *sem) if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0) return 0; else - return __new_sem_wait_slow((struct new_sem *) sem, NULL); + return __new_sem_wait_slow ((struct new_sem *) sem, NULL); } -versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); +compat_symbol (libpthread, __old_sem_wait_cancel, sem_wait, GLIBC_2_1); +#endif #if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) int diff --git a/nptl/tst-cancel12.c b/nptl/tst-cancel12.c index bf94aa482a..83f4eade45 100644 --- a/nptl/tst-cancel12.c +++ b/nptl/tst-cancel12.c @@ -25,6 +25,8 @@ #include #include +#include +#include static pthread_barrier_t bar; static sem_t sem; @@ -35,11 +37,7 @@ cleanup (void *arg) { static int ncall; - if (++ncall != 1) - { - puts ("second call to cleanup"); - exit (1); - } + TEST_VERIFY_EXIT (++ncall != 1); } @@ -48,14 +46,9 @@ tf (void *arg) { pthread_cleanup_push (cleanup, NULL); - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("error: tf: 1st barrier_wait failed"); - exit (1); - } + xpthread_barrier_wait (&bar); - /* This call should be cancelable. */ + /* This call should not be cancelable. */ sem_wait (&sem); pthread_cleanup_pop (0); @@ -67,57 +60,23 @@ tf (void *arg) static int do_test (void) { - pthread_t th; - - if (pthread_barrier_init (&bar, NULL, 2) != 0) - { - puts ("error: barrier_init failed"); - exit (1); - } + xpthread_barrier_init (&bar, NULL, 2); /* A value higher than 0 will check for uncontended pthread cancellation, where the sem_wait operation will return immediatelly. */ - if (sem_init (&sem, 0, 1) != 0) - { - puts ("error: sem_init failed"); - exit (1); - } - - if (pthread_create (&th, NULL, tf, NULL) != 0) - { - puts ("error: create failed"); - exit (1); - } - - if (pthread_cancel (th) != 0) - { - puts ("error: pthread_cancel failed"); - exit (1); - } - - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("error: 1st barrier_wait failed"); - exit (1); - } - - void *r; - if (pthread_join (th, &r) != 0) - { - puts ("error: pthread_join failed"); - exit (1); - } - - if (r != PTHREAD_CANCELED) - { - puts ("error: thread not canceled"); - exit (1); - } + TEST_COMPARE (sem_init (&sem, 0, 1), 0); + + pthread_t th = xpthread_create (NULL, tf, NULL); + xpthread_cancel (th); + + xpthread_barrier_wait (&bar); + + void *r = xpthread_join (th); + + /* sem_wait is not a cancellation entrypoint. */ + TEST_VERIFY (r == 0); return 0; } - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/nptl/tst-cancel14.c b/nptl/tst-cancel14.c index e8f8a46604..ef65c09b6b 100644 --- a/nptl/tst-cancel14.c +++ b/nptl/tst-cancel14.c @@ -26,6 +26,9 @@ #include #include +#include +#include +#include static pthread_barrier_t bar; static sem_t sem; @@ -36,11 +39,7 @@ cleanup (void *arg) { static int ncall; - if (++ncall != 1) - { - puts ("second call to cleanup"); - exit (1); - } + TEST_VERIFY_EXIT (++ncall != 1); } @@ -49,23 +48,13 @@ tf (void *arg) { pthread_cleanup_push (cleanup, NULL); - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("error: tf: 1st barrier_wait failed"); - exit (1); - } - - struct timeval tv; - (void) gettimeofday (&tv, NULL); - - struct timespec ts; - TIMEVAL_TO_TIMESPEC (&tv, &ts); + xpthread_barrier_wait (&bar); /* Timeout in 5 seconds. */ - ts.tv_sec += 5; + const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), + make_timespec (0, 500000000)); - /* This call should block and be cancelable. */ + /* This call should not be cancelable. */ sem_timedwait (&sem, &ts); pthread_cleanup_pop (0); @@ -77,57 +66,22 @@ tf (void *arg) static int do_test (void) { - pthread_t th; - - if (pthread_barrier_init (&bar, NULL, 2) != 0) - { - puts ("error: barrier_init failed"); - exit (1); - } - - if (sem_init (&sem, 0, 1) != 0) - { - puts ("error: sem_init failed"); - exit (1); - } - - if (pthread_create (&th, NULL, tf, NULL) != 0) - { - puts ("error: create failed"); - exit (1); - } - - /* Check whether cancellation is honored even before sem_timedwait does - anything. */ - if (pthread_cancel (th) != 0) - { - puts ("error: 1st cancel failed"); - exit (1); - } - - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("1st barrier_wait failed"); - exit (1); - } - - void *r; - if (pthread_join (th, &r) != 0) - { - puts ("join failed"); - exit (1); - } - - if (r != PTHREAD_CANCELED) - { - puts ("thread not canceled"); - exit (1); - } + xpthread_barrier_init (&bar, NULL, 2); + + TEST_COMPARE (sem_init (&sem, 0, 1), 0); + + pthread_t th = xpthread_create (NULL, tf, NULL); + + xpthread_cancel (th); + + xpthread_barrier_wait (&bar); + + void *r = xpthread_join (th); + + /* sem_timedwait is not a cancellation entrypoint. */ + TEST_VERIFY (r == 0); return 0; } - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 9a9e4cee85..aa7ae30ebd 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -243,3 +243,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index b413007ccb..da80cb4e95 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/arm/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/libpthread.abilist index af82a4c632..5253f5e12a 100644 --- a/sysdeps/unix/sysv/linux/arm/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/libpthread.abilist @@ -27,6 +27,8 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 _IO_flockfile F GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index ea4b79a518..fab8ab09c3 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -233,3 +233,5 @@ GLIBC_2.29 tss_set F GLIBC_2.29 wait F GLIBC_2.29 waitpid F GLIBC_2.29 write F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index bcba07f575..cc42bcc08d 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -245,6 +245,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index bece86d246..6bb305a7cf 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -253,6 +253,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index ccc9449826..42fcd4b7b8 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -247,6 +247,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index af82a4c632..5253f5e12a 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -27,6 +27,8 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 _IO_flockfile F GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index bece86d246..6bb305a7cf 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -253,6 +253,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist index 5067375d23..935c8ee0be 100644 --- a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist @@ -243,3 +243,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 02144967c6..b2e8851c18 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 02144967c6..b2e8851c18 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 78cac2ae27..2777918e20 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -241,3 +241,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 09e8447b06..34003d31ca 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.3.4 siglongjmp F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 8300958d47..ec8de8f712 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -246,6 +246,8 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.3.4 siglongjmp F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index 9a9e4cee85..aa7ae30ebd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -243,3 +243,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index c370fda73d..3f1779c515 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -235,3 +235,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index d05468f3b2..af5e312d0d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index e8161aa747..d64a50e67b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -247,6 +247,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/sh/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/libpthread.abilist index bcba07f575..cc42bcc08d 100644 --- a/sysdeps/unix/sysv/linux/sh/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/libpthread.abilist @@ -245,6 +245,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index b413007ccb..da80cb4e95 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -255,6 +255,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index ccc9449826..42fcd4b7b8 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -247,6 +247,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 931c8277a8..8d36c70f43 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -245,6 +245,8 @@ GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F GLIBC_2.4 pthread_mutex_consistent_np F GLIBC_2.4 pthread_mutex_getprioceiling F GLIBC_2.4 pthread_mutex_setprioceiling F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index c09c9b015a..2df8d61a53 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -243,3 +243,5 @@ GLIBC_2.28 tss_create F GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F +GLIBC_2.30 sem_timedwait F +GLIBC_2.30 sem_wait F