summaryrefslogtreecommitdiffstats
path: root/lib/libthr/thread/thr_cancel.c
diff options
context:
space:
mode:
authormtm <mtm@FreeBSD.org>2003-07-06 10:10:32 +0000
committermtm <mtm@FreeBSD.org>2003-07-06 10:10:32 +0000
commitd4808894e4846559ec5d35948da89927a1034b33 (patch)
tree5cafa78cb831b87996f103105197dbac29bf9d58 /lib/libthr/thread/thr_cancel.c
parentb505b0da1eee42e0ad971581478b7a0637a486ec (diff)
downloadFreeBSD-src-d4808894e4846559ec5d35948da89927a1034b33.zip
FreeBSD-src-d4808894e4846559ec5d35948da89927a1034b33.tar.gz
There's no need for _umtxtrylock to be a separate function.
Roll it into the pre-existing macro that's used to call it.
Diffstat (limited to 'lib/libthr/thread/thr_cancel.c')
-rw-r--r--lib/libthr/thread/thr_cancel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 311cf1e..180607c 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -80,7 +80,8 @@ retry:
* Disconnect the thread from the joinee:
*/
if ((joined = pthread->join_status.thread) != NULL) {
- if (THR_TRYLOCK(&joined->lock) == EBUSY) {
+ THR_TRYLOCK(&joined->lock, ret);
+ if (ret == EBUSY) {
_thread_critical_exit(pthread);
goto retry;
}
OpenPOWER on IntegriCloud