From b026ce1ee92de325463535c15ab5575f21b23702 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Mon, 11 Feb 2019 16:02:56 -0500 Subject: [PATCH] nptl: Fix pthread_tryjoin comment. In pthread_tryjoin if pd->tid == 0 then we will not block on a futex operation because we will immediately see the join is already complete and return. The comment is fixed to reflect that. Signed-off-by: Carlos O'Donell --- ChangeLog | 4 ++++ nptl/pthread_tryjoin.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index de10cb598f..95765b8b98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2019-02-19 Carlos O'Donell + + * nptl/pthread_tryjoin.c: Fix comment. + 2019-02-18 Joseph Myers [BZ #24231] diff --git a/nptl/pthread_tryjoin.c b/nptl/pthread_tryjoin.c index aa4fe07af5..7dbf22868d 100644 --- a/nptl/pthread_tryjoin.c +++ b/nptl/pthread_tryjoin.c @@ -26,7 +26,7 @@ pthread_tryjoin_np (pthread_t threadid, void **thread_return) if (pd->tid != 0) return EBUSY; - /* If pd->tid != 0 then lll_wait_tid will not block on futex + /* If pd->tid == 0 then lll_wait_tid will not block on futex operation. */ return __pthread_timedjoin_ex (threadid, thread_return, NULL, false); } -- 2.11.4.GIT