summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2019-02-11 16:02:56 -0500
committerCarlos O'Donell <carlos@redhat.com>2019-02-19 09:22:34 -0500
commitb026ce1ee92de325463535c15ab5575f21b23702 (patch)
tree7426bef86a4f52e131a9415342d400541200a8aa
parent8c9289b64271639661e5dbe3c19c0badc9db9cfa (diff)
downloadglibc-b026ce1ee92de325463535c15ab5575f21b23702.tar.gz
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 <carlos@redhat.com>
-rw-r--r--ChangeLog4
-rw-r--r--nptl/pthread_tryjoin.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de10cb598f..95765b8b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-02-19 Carlos O'Donell <carlos@redhat.com>
+
+ * nptl/pthread_tryjoin.c: Fix comment.
+
2019-02-18 Joseph Myers <joseph@codesourcery.com>
[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);
}