qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #5240] 

* sysdeps/unix/sysv/linux/lowlevellock.c (__lll_timedlock_wait):
	If we time out, try one last time to lock the futex to avoid
	losing a wakeup signal.
	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
This commit is contained in:
Ulrich Drepper 2007-11-09 09:09:07 +00:00
parent 0f7e0ee507
commit cbed6a607d
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nptl/ChangeLog
View File

@ -1,5 +1,12 @@
2007-11-08 Ulrich Drepper <drepper@redhat.com> 2007-11-08 Ulrich Drepper <drepper@redhat.com>
[BZ #5240]
* sysdeps/unix/sysv/linux/lowlevellock.c (__lll_timedlock_wait):
If we time out, try one last time to lock the futex to avoid
losing a wakeup signal.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
[BZ #5245] [BZ #5245]
* sysdeps/pthread/createthread.c (do_clone): Translate clone error * sysdeps/pthread/createthread.c (do_clone): Translate clone error
if necessary. if necessary.

6
nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
View File

@ -203,7 +203,7 @@ __lll_timedlock_wait:
addl $1000000000, %edx addl $1000000000, %edx
subl $1, %ecx subl $1, %ecx
4: testl %ecx, %ecx 4: testl %ecx, %ecx
js 5f /* Time is already up. */ js 9f /* Time is already up. */
/* Store relative timeout. */ /* Store relative timeout. */
movl %ecx, (%esp) movl %ecx, (%esp)
@ -271,6 +271,10 @@ __lll_timedlock_wait:
5: movl $ETIMEDOUT, %eax 5: movl $ETIMEDOUT, %eax
jmp 6b jmp 6b
9: movl $-ETIMEDOUT, %ecx
movl $2, %edx
jmp 8b
cfi_endproc cfi_endproc
.size __lll_timedlock_wait,.-__lll_timedlock_wait .size __lll_timedlock_wait,.-__lll_timedlock_wait
#endif #endif

23
nptl/sysdeps/unix/sysv/linux/lowlevellock.c
View File

@ -59,10 +59,10 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
return EINVAL; return EINVAL;
struct timespec rt;
do do
{ {
struct timeval tv; struct timeval tv;
struct timespec rt;
/* Get the current time. */ /* Get the current time. */
(void) __gettimeofday (&tv, NULL); (void) __gettimeofday (&tv, NULL);
@ -76,18 +76,21 @@ __lll_timedlock_wait (int *futex, const struct timespec *abstime, int private)
--rt.tv_sec; --rt.tv_sec;
} }
/* Already timed out? */ /* If timed out do not go to sleep. */
if (rt.tv_sec < 0) if (__builtin_expect (rt.tv_sec >= 0, 1))
return ETIMEDOUT; {
/* Wait. */
int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
if (oldval != 0)
lll_futex_timed_wait (futex, 2, &rt, private);
}
/* Wait. */ if (atomic_compare_and_exchange_bool_acq (futex, 2, 0) == 0)
int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1); return 0;
if (oldval != 0)
lll_futex_timed_wait (futex, 2, &rt, private);
} }
while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0); while (rt.tv_sec >= 0);
return 0; return ETIMEDOUT;
} }

6
nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
View File

@ -199,14 +199,16 @@ __lll_timedlock_wait:
addq $1000000000, %rsi addq $1000000000, %rsi
decq %rdi decq %rdi
4: testq %rdi, %rdi 4: testq %rdi, %rdi
js 5f /* Time is already up. */ movq $-ETIMEDOUT, %rcx
movl $2, %edx
js 8f /* Time is already up. */
/* Futex call. */ /* Futex call. */
movq %rdi, (%rsp) /* Store relative timeout. */ movq %rdi, (%rsp) /* Store relative timeout. */
movq %rsi, 8(%rsp) movq %rsi, 8(%rsp)
movl $1, %eax movl $1, %eax
movl $2, %edx /* NB: $edx has been loaded early. */
LOCK LOCK
cmpxchgl %edx, (%r12) cmpxchgl %edx, (%r12)