about summary refs log tree commit diff
path: root/nptl/pthread_join.c
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-10-31 10:03:21 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-11-01 11:23:43 -0300
commit69ca4b54c151cec42ccca5e05790efc1a8206b47 (patch)
treee239090413e1da5dbd3a9fc3ce54895da5624346 /nptl/pthread_join.c
parent893bbdd0072fbf96808e66af04b970e5b39171fb (diff)
downloadglibc-69ca4b54c151cec42ccca5e05790efc1a8206b47.tar.gz
glibc-69ca4b54c151cec42ccca5e05790efc1a8206b47.tar.xz
glibc-69ca4b54c151cec42ccca5e05790efc1a8206b47.zip
nptl: Add pthread_clockjoin_np
Introduce pthread_clockjoin_np as a version of pthread_timedjoin_np that
accepts a clockid_t parameter to indicate which clock the timeout should be
measured against. This mirrors the recently-added POSIX-proposed "clock"
wait functions.

Checked on x86_64-linux-gnu.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_join.c')
-rw-r--r--nptl/pthread_join.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c
index 3523b20fe5..c7ff5a393b 100644
--- a/nptl/pthread_join.c
+++ b/nptl/pthread_join.c
@@ -21,6 +21,7 @@
 int
 __pthread_join (pthread_t threadid, void **thread_return)
 {
-  return __pthread_timedjoin_ex (threadid, thread_return, NULL, true);
+  return __pthread_clockjoin_ex (threadid, thread_return, 0 /* Ignored */,
+				 NULL, true);
 }
 weak_alias (__pthread_join, pthread_join)