From 0fc317d83c1167393bf276a8bfbdd9a4e02e8258 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 2 Mar 2015 17:46:22 -0500 Subject: factor cancellation cleanup push/pop out of futex __timedwait function previously, the __timedwait function was optionally a cancellation point depending on whether it was passed a pointer to a cleaup function and context to register. as of now, only one caller actually used such a cleanup function (and it may face removal soon); most callers either passed a null pointer to disable cancellation or a dummy cleanup function. now, __timedwait is never a cancellation point, and __timedwait_cp is the cancellable version. this makes the intent of the calling code more obvious and avoids ugly dummy functions and long argument lists. --- src/thread/pthread_mutex_timedlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/thread/pthread_mutex_timedlock.c') diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c index 16241eeb..0a240e79 100644 --- a/src/thread/pthread_mutex_timedlock.c +++ b/src/thread/pthread_mutex_timedlock.c @@ -24,7 +24,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec a_inc(&m->_m_waiters); t = r | 0x80000000; a_cas(&m->_m_lock, r, t); - r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, 0, 0, priv); + r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, priv); a_dec(&m->_m_waiters); if (r && r != EINTR) break; } -- cgit v1.2.1