diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-09-10 18:59:03 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-09-10 18:59:03 +0000 |
commit | effe3e2d1a084fde8fae9b91febb28c97781f9e5 (patch) | |
tree | 97749ea80a323592d3d80f24627f9fcb8b8b7297 /nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | |
parent | b2adc86677d215d3d8071393d2a69357dd844821 (diff) |
Updated to fedora-glibc-20060910T1832cvs/fedora-glibc-2_4_90-31
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S index b837d466b1..969e80da2a 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -67,9 +67,15 @@ __condvar_cleanup: cmpl 4(%r8), %edx jne 3f + /* We increment the wakeup_seq counter only if it is lower than + total_seq. If this is not the case the thread was woken and + then canceled. In this case we ignore the signal. */ + movq total_seq(%rdi), %rax + cmpq wakeup_seq(%rdi), %rax + jbe 6f incq wakeup_seq(%rdi) - incq woken_seq(%rdi) incl cond_futex(%rdi) +6: incq woken_seq(%rdi) 3: subl $(1 << clock_bits), cond_nwaiters(%rdi) |