From f911cc4a7455dfcaf6edb38e7525241ff0268109 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 18 Mar 2003 00:50:30 +0000 Subject: [PATCH] (lll_unlock_wake_cb): Correct last patch. (__lll_timedwait_tid): Don't check abstime for NULL pointer. --- nptl/sysdeps/unix/sysv/linux/lowlevellock.c | 9 ++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c index 4ce4235..99f804c 100644 --- a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c @@ -80,8 +80,11 @@ hidden_proto (__lll_timedlock_wait) int lll_unlock_wake_cb (int *futex) { - if (__lll_add (futex, 1) + 1 != 0) - lll_futex_wake (futex, 1); + if (__lll_add (futex, -1) - 1 != 0) + { + *futex = 0; + lll_futex_wake (futex, 1); + } return 0; } @@ -93,7 +96,7 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime) { int tid; - if (abstime == NULL || abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec >= 1000000000) return EINVAL; /* Repeat until thread terminated. */ diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index daece67..b54ebbf 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -226,7 +226,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden; __asm __volatile ("cmpl $0, __libc_multiple_threads(%%rip)\n\t" \ "je 0f\n\t" \ "lock\n" \ - "0:\incl %0\n\t" \ + "0:\tincl %0\n\t" \ "jng 1f\n\t" \ ".subsection 1\n" \ "1:\tleaq %0, %%rdi\n\t" \ -- 2.7.4