diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-11-25 17:15:51 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-11-27 09:59:13 -0300 |
commit | 71eeae0325a95f5e5d7ec4a27a6a6c357e0c8ef4 (patch) | |
tree | 470fe6a8c1ab863ad0c400d6e19924c2d265ac68 /nptl/Makefile | |
parent | 9ff2674ef82eccd5ae5dfa6bb733c0e3613764c6 (diff) | |
download | glibc-71eeae0325a95f5e5d7ec4a27a6a6c357e0c8ef4.tar.gz glibc-71eeae0325a95f5e5d7ec4a27a6a6c357e0c8ef4.tar.xz glibc-71eeae0325a95f5e5d7ec4a27a6a6c357e0c8ef4.zip |
nptl: Fix PTHREAD_PRIO_PROTECT timed lock
The 878fe624d4 changed lll_futex_timed_wait, which expects a relative timeout, with a __futex_abstimed_wait64, which expects an absolute timeout. However the code still passes a relative timeout. Also, the PTHREAD_PRIO_PROTECT support for clocks different than CLOCK_REALTIME was broken since the inclusion of pthread_mutex_clocklock (9d20e22e46) since lll_futex_timed_wait always use CLOCK_REALTIME. This patch fixes by removing the relative time calculation. It also adds some xtests that tests both thread and inter-process usage. Checked on x86_64-linux-gnu.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r-- | nptl/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index a48426a396..94d805f0d4 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -309,7 +309,8 @@ tests-internal := tst-robustpi8 tst-rwlock19 tst-rwlock20 \ tst-setgetname \ xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \ - tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 tst-setgroups + tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 tst-setgroups \ + tst-mutexpp5 tst-mutexpp9 # This test can run into task limits because of a linux kernel bug # and then cause the make process to fail too, see bug 24537. |