]> git.ipfire.org Git - thirdparty/glibc.git/commit
htl: Add clock variants
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Tue, 26 May 2020 00:09:11 +0000 (00:09 +0000)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Tue, 26 May 2020 00:46:07 +0000 (00:46 +0000)
commit28cada041811fe49c8da1eb7ffdbc949719f9009
tree8b90e7057ebc557a755e0ceb665e037c6fbb58a6
parent02802fafcf6e11ea3f998f685035ffe568dfddeb
htl: Add clock variants

* htl/pt-join.c (__pthread_join): Move implementation to...
(__pthread_join_common): ... new function. Add try, timed and clock support.
(__pthread_join): Reimplement on top of __pthread_join_common.
(__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np):
Implement on top of __pthread_join_common.
(pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New
aliases.

* hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait,
__lll_abstimed_lock): Check for supported clock.

* sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal):
Add clockid parameter and support it.
(__pthread_cond_timedwait): Pass -1 as clockid.
(__pthread_cond_clockwait): New function.
(pthread_cond_clockwait): New alias.
* sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update
prototype.
(__pthread_cond_wait): Pass -1 as clockid.

* sysdeps/htl/pt-rwlock-timedrdlock.c
(__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and
support id.
(__pthread_rwlock_clockrdlock): New function.
(pthread_rwlock_clockrdlock): New alias.
* sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update
prototype.
(__pthread_rwlock_rdlock): Pass -1 as clockid.

* sysdeps/htl/pt-rwlock-timedwrlock.c
(__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and
support id.
(__pthread_rwlock_clockwrlock): New function.
(pthread_rwlock_clockwrlock): New alias.
* sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update
prototype.
(__pthread_rwlock_wrlock): Pass -1 as clockid.

* sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to
(__pthread_mutex_clocklock): New function with additional clockid
parameter and support it.
(pthread_mutex_clocklock): New alias.
(__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock.

* sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np,
pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait,
pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes.
* sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype.

* htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait,
pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock,
pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np.
* sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np,
pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock,
pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np):
New functions.

* nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c,
nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c,
nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c,
nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c,
nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c,
nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread.
* sysdeps/pthread/tst-mutex8.c: Move back to nptl.
* nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust,
tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3,
tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14,
tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ...
* sysdeps/pthread/Makefile (tests): ... here.
35 files changed:
htl/Versions
htl/pt-join.c
hurd/hurdlock.c
nptl/Makefile
nptl/tst-mutex8.c [moved from sysdeps/pthread/tst-mutex8.c with 100% similarity]
sysdeps/htl/pt-cond-timedwait.c
sysdeps/htl/pt-cond-wait.c
sysdeps/htl/pt-rwlock-rdlock.c
sysdeps/htl/pt-rwlock-timedrdlock.c
sysdeps/htl/pt-rwlock-timedwrlock.c
sysdeps/htl/pt-rwlock-wrlock.c
sysdeps/htl/pthread.h
sysdeps/htl/pthreadP.h
sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
sysdeps/mach/hurd/i386/libpthread.abilist
sysdeps/pthread/Makefile
sysdeps/pthread/tst-abstime.c [moved from nptl/tst-abstime.c with 100% similarity]
sysdeps/pthread/tst-join10.c [moved from nptl/tst-join10.c with 100% similarity]
sysdeps/pthread/tst-join11.c [moved from nptl/tst-join11.c with 100% similarity]
sysdeps/pthread/tst-join12.c [moved from nptl/tst-join12.c with 100% similarity]
sysdeps/pthread/tst-join13.c [moved from nptl/tst-join13.c with 100% similarity]
sysdeps/pthread/tst-join14.c [moved from nptl/tst-join14.c with 100% similarity]
sysdeps/pthread/tst-join2.c [moved from nptl/tst-join2.c with 100% similarity]
sysdeps/pthread/tst-join3.c [moved from nptl/tst-join3.c with 100% similarity]
sysdeps/pthread/tst-join8.c [moved from nptl/tst-join8.c with 100% similarity]
sysdeps/pthread/tst-join9.c [moved from nptl/tst-join9.c with 100% similarity]
sysdeps/pthread/tst-mutex-errorcheck.c [moved from nptl/tst-mutex-errorcheck.c with 100% similarity]
sysdeps/pthread/tst-mutex11.c [moved from nptl/tst-mutex11.c with 100% similarity]
sysdeps/pthread/tst-mutex5.c [moved from nptl/tst-mutex5.c with 100% similarity]
sysdeps/pthread/tst-mutex7.c [moved from nptl/tst-mutex7.c with 100% similarity]
sysdeps/pthread/tst-mutex7robust.c [moved from nptl/tst-mutex7robust.c with 100% similarity]
sysdeps/pthread/tst-mutex9.c [moved from nptl/tst-mutex9.c with 100% similarity]
sysdeps/pthread/tst-pthread-mutexattr.c [moved from nptl/tst-pthread-mutexattr.c with 100% similarity]
sysdeps/pthread/tst-rwlock12.c [moved from nptl/tst-rwlock12.c with 100% similarity]
sysdeps/pthread/tst-rwlock14.c [moved from nptl/tst-rwlock14.c with 100% similarity]