diff options
author | Rich Felker <dalias@aerifal.cx> | 2015-03-02 17:46:22 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2015-03-02 17:46:22 -0500 |
commit | 0fc317d83c1167393bf276a8bfbdd9a4e02e8258 (patch) | |
tree | 8528b13bb7a68b2553ebab797e428283eee11a06 /src/thread/pthread_cond_timedwait.c | |
parent | 76ca7a5446a8aec2b671a401d5e1878c4704754e (diff) | |
download | musl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.tar.gz musl-0fc317d83c1167393bf276a8bfbdd9a4e02e8258.tar.bz2 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_cond_timedwait.c')
-rw-r--r-- | src/thread/pthread_cond_timedwait.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index adf9c6e5..f5fd08c0 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -64,10 +64,6 @@ enum { LEAVING, }; -static void dummy(void *arg) -{ -} - int __pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restrict m, const struct timespec *restrict ts) { struct waiter node = { 0 }; @@ -104,7 +100,7 @@ int __pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restri __pthread_setcancelstate(PTHREAD_CANCEL_MASKED, &cs); - do e = __timedwait(fut, seq, clock, ts, dummy, 0, !shared); + do e = __timedwait_cp(fut, seq, clock, ts, !shared); while (*fut==seq && (!e || e==EINTR)); if (e == EINTR) e = 0; |