From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Cc: Mike Crowe <mac@mcrowe.com>, Michael Kerrisk <mtk.manpages@gmail.com>
Subject: [PATCH 02/13] nptl: Remove futex_wait_cancelable
Date: Mon, 23 Nov 2020 16:52:45 -0300 [thread overview]
Message-ID: <20201123195256.3336217-2-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20201123195256.3336217-1-adhemerval.zanella@linaro.org>
It is used solely on __pthread_cond_wait_common and the call can be
replaced by a __futex_abstimed_wait_cancelable64 one.
Checked on x86_64-linux-gnu and i686-linux-gnu.
---
nptl/pthread_cond_wait.c | 22 ++--------------------
sysdeps/nptl/futex-internal.h | 29 -----------------------------
2 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
index 7d158d553f..685dbca32f 100644
--- a/nptl/pthread_cond_wait.c
+++ b/nptl/pthread_cond_wait.c
@@ -501,26 +501,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
cbuffer.private = private;
__pthread_cleanup_push (&buffer, __condvar_cleanup_waiting, &cbuffer);
- if (abstime == NULL)
- {
- /* Block without a timeout. */
- err = futex_wait_cancelable (
- cond->__data.__g_signals + g, 0, private);
- }
- else
- {
- /* Block, but with a timeout.
- Work around the fact that the kernel rejects negative timeout
- values despite them being valid. */
- if (__glibc_unlikely (abstime->tv_sec < 0))
- err = ETIMEDOUT;
- else
- {
- err = __futex_abstimed_wait_cancelable64
- (cond->__data.__g_signals + g, 0, clockid, abstime,
- private);
- }
- }
+ err = __futex_abstimed_wait_cancelable64 (
+ cond->__data.__g_signals + g, 0, clockid, abstime, private);
__pthread_cleanup_pop (&buffer, 0);
diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index 21e3b74be6..96d1318091 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -177,35 +177,6 @@ futex_wait_simple (unsigned int *futex_word, unsigned int expected,
ignore_value (futex_wait (futex_word, expected, private));
}
-
-/* Like futex_wait but is a POSIX cancellation point. */
-static __always_inline int
-futex_wait_cancelable (unsigned int *futex_word, unsigned int expected,
- int private)
-{
- int oldtype;
- oldtype = __pthread_enable_asynccancel ();
- int err = lll_futex_timed_wait (futex_word, expected, NULL, private);
- __pthread_disable_asynccancel (oldtype);
- switch (err)
- {
- case 0:
- case -EAGAIN:
- case -EINTR:
- return -err;
-
- case -ETIMEDOUT: /* Cannot have happened as we provided no timeout. */
- case -EFAULT: /* Must have been caused by a glibc or application bug. */
- case -EINVAL: /* Either due to wrong alignment or due to the timeout not
- being normalized. Must have been caused by a glibc or
- application bug. */
- case -ENOSYS: /* Must have been caused by a glibc bug. */
- /* No other errors are documented at this time. */
- default:
- futex_fatal_error ();
- }
-}
-
/* Like futex_wait, but will eventually time out (i.e., stop being
blocked) after the duration of time provided (i.e., RELTIME) has
passed. The caller must provide a normalized RELTIME. RELTIME can also
--
2.25.1
next prev parent reply other threads:[~2020-11-23 19:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 19:52 [PATCH 01/13] linux: Remove unused internal futex functions Adhemerval Zanella
2020-11-23 19:52 ` Adhemerval Zanella [this message]
2020-11-24 18:01 ` [PATCH 02/13] nptl: Remove futex_wait_cancelable Lukasz Majewski
2020-11-23 19:52 ` [PATCH 03/13] nptl: Remove clockwait_tid Adhemerval Zanella
2020-11-24 18:13 ` Lukasz Majewski
2020-12-14 12:16 ` Florian Weimer
2020-12-14 12:47 ` Andreas Schwab
2020-12-14 13:11 ` Florian Weimer
2020-12-14 14:02 ` Florian Weimer
2020-12-14 12:52 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 04/13] linux: Extend __futex_abstimed_wait_cancelable64 comment Adhemerval Zanella
2020-11-24 18:16 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 05/13] linux: nptl: Consolidate __futex_abstimed_wait_{cancelable}64 Adhemerval Zanella
2020-11-24 18:19 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 06/13] linux: nptl: Remove _futex_clock_wait_bitset64 Adhemerval Zanella
2020-11-24 18:26 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 07/13] linux: nptl: Replace __futex_clocklock_wait64 with __futex_abstimed_wait64 Adhemerval Zanella
2020-11-24 21:28 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 08/13] linux: nptl: Replace lll_timedwait " Adhemerval Zanella
2020-11-24 21:29 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 09/13] linux: nptl: Replace lll_futex_{timed_}wait by futex-internal.h Adhemerval Zanella
2020-11-24 21:35 ` Lukasz Majewski
2020-11-25 15:32 ` Mike Crowe
2020-11-25 15:40 ` Adhemerval Zanella
2020-11-25 15:46 ` Mike Crowe
2020-11-25 17:19 ` Adhemerval Zanella
2020-11-25 17:37 ` Mike Crowe
2020-11-25 17:56 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 10/13] linux: nptl: Replace lll_futex_supported_clockid with futex-internal.h Adhemerval Zanella
2020-11-24 21:36 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 11/13] nptl: Replace lll_futex_wake " Adhemerval Zanella
2020-11-24 21:38 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH v2 12/13] nptl: Return EINVAL for pthread_mutex_clocklock/PI with CLOCK_MONOTONIC [BZ #26801] Adhemerval Zanella
2020-11-24 21:43 ` Lukasz Majewski
2020-11-24 21:49 ` Lukasz Majewski
2020-11-27 17:39 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 13/13] linux: Return EINVAL for invalid clock for pthread_clockjoin_np Adhemerval Zanella
2020-11-24 21:48 ` Lukasz Majewski
2020-11-24 22:58 ` Lukasz Majewski
2020-11-24 17:51 ` [PATCH 01/13] linux: Remove unused internal futex functions Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201123195256.3336217-2-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=mac@mcrowe.com \
--cc=mtk.manpages@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).