about summary refs log tree commit diff
path: root/src/thread/pthread_rwlock_timedwrlock.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-03-02 17:46:22 -0500
committerRich Felker <dalias@aerifal.cx>2015-03-02 17:46:22 -0500
commit0fc317d83c1167393bf276a8bfbdd9a4e02e8258 (patch)
tree8528b13bb7a68b2553ebab797e428283eee11a06 /src/thread/pthread_rwlock_timedwrlock.c
parent76ca7a5446a8aec2b671a401d5e1878c4704754e (diff)
downloadmusl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.tar.gz
musl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.tar.xz
musl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.zip
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.
Diffstat (limited to 'src/thread/pthread_rwlock_timedwrlock.c')
-rw-r--r--src/thread/pthread_rwlock_timedwrlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 8d04f561..7f26dad1 100644
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -15,7 +15,7 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times
 		t = r | 0x80000000;
 		a_inc(&rw->_rw_waiters);
 		a_cas(&rw->_rw_lock, r, t);
-		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, 0, 0, rw->_rw_shared^128);
+		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
 		a_dec(&rw->_rw_waiters);
 		if (r && r != EINTR) return r;
 	}