lib/glibc
lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-05-19 05:53:43 +03:00
Code

Work around kernel rejecting valid absolute timestamps

Browse Source
This commit is contained in:
Andreas Schwab 2010-07-01 19:07:14 -07:00 committed by Ulrich Drepper
parent 72b6e8c85b
commit 2983d85ee5
9 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nptl/ChangeLog
View File

@ -1,3 +1,23 @@
2010-07-01 Andreas Schwab <schwab@redhat.com>
Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-abstime.
* tst-abstime.c: New file.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
(__lll_timedlock_wait): Check for timestamp before the Epoch.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
(__lll_timedlock_wait): Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
(__lll_robust_timedlock_wait): Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
(__pthread_cond_timedwait): Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
(pthread_rwlock_timedrdlock): Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
(pthread_rwlock_timedwrlock): Likewise.
* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait):
Likewise.
2010-07-01 Ulrich Drepper <drepper@redhat.com> 2010-07-01 Ulrich Drepper <drepper@redhat.com>
* Makefile (tst-_res1): Add tst-_res1mod1 to dependency list. * Makefile (tst-_res1): Add tst-_res1mod1 to dependency list.

1
nptl/Makefile
View File

@ -256,6 +256,7 @@ tests = tst-typesizes \
tst-sched1 \ tst-sched1 \
tst-backtrace1 \ tst-backtrace1 \
tst-oddstacklimit \ tst-oddstacklimit \
tst-abstime \
tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \ tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
tst-getpid1 tst-getpid2 tst-getpid3 \ tst-getpid1 tst-getpid2 tst-getpid3 \
tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99) tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)

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

@ -1,4 +1,4 @@
/* Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002-2004,2006,2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -188,6 +188,9 @@ __lll_timedlock_wait:
je .Lreltmo je .Lreltmo
# endif # endif
cmpl $0, (%edx)
js 8f
movl %ecx, %ebx movl %ecx, %ebx
movl %esi, %ecx movl %esi, %ecx
movl %edx, %esi movl %edx, %esi
@ -223,6 +226,9 @@ __lll_timedlock_wait:
cfi_restore(%ebp) cfi_restore(%ebp)
ret ret
8: movl $ETIMEDOUT, %eax
jmp 7b
# ifndef __ASSUME_FUTEX_CLOCK_REALTIME # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo: .Lreltmo:
/* Check for a valid timeout value. */ /* Check for a valid timeout value. */

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

@ -1,4 +1,4 @@
/* Copyright (C) 2002-2006, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -169,9 +169,13 @@ __lll_timedlock_wait:
je .Lreltmo je .Lreltmo
# endif # endif
cmpq $0, (%rdx)
js 5f
pushq %r9 pushq %r9
cfi_adjust_cfa_offset(8) cfi_adjust_cfa_offset(8)
cfi_rel_offset(%r9, 0) cfi_rel_offset(%r9, 0)
movq %rdx, %r10 movq %rdx, %r10
movl $0xffffffff, %r9d movl $0xffffffff, %r9d
LOAD_FUTEX_WAIT_ABS (%esi) LOAD_FUTEX_WAIT_ABS (%esi)
@ -202,6 +206,9 @@ __lll_timedlock_wait:
cfi_restore(%r9) cfi_restore(%r9)
retq retq
5: movl $ETIMEDOUT, %eax
retq
# ifndef __ASSUME_FUTEX_CLOCK_REALTIME # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo: .Lreltmo:
/* Check for a valid timeout value. */ /* Check for a valid timeout value. */

9
nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
View File

@ -1,5 +1,4 @@
/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 /* Copyright (C) 2002=2007, 2009, 2010 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -125,6 +124,9 @@ __lll_robust_timedlock_wait:
je .Lreltmo je .Lreltmo
# endif # endif
cmpq $0, (%rdx)
js 7f
pushq %r9 pushq %r9
cfi_adjust_cfa_offset(8) cfi_adjust_cfa_offset(8)
cfi_rel_offset(%r9, 0) cfi_rel_offset(%r9, 0)
@ -180,6 +182,9 @@ __lll_robust_timedlock_wait:
cfi_adjust_cfa_offset(-8) cfi_adjust_cfa_offset(-8)
cfi_restore(%r9) cfi_restore(%r9)
7: movl $ETIMEDOUT, %eax
retq
# ifndef __ASSUME_FUTEX_CLOCK_REALTIME # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo: .Lreltmo:

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

@ -1,4 +1,4 @@
/* Copyright (C) 2002-2005, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002-2005, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -144,6 +144,10 @@ __pthread_cond_timedwait:
movq %r9, 24(%rsp) movq %r9, 24(%rsp)
movl %edx, 4(%rsp) movl %edx, 4(%rsp)
cmpq $0, (%r13)
movq $-ETIMEDOUT, %r14
js 36f
38: movl cond_futex(%rdi), %r12d 38: movl cond_futex(%rdi), %r12d
/* Unlock. */ /* Unlock. */

5
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002-2005, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002-2005, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -102,6 +102,9 @@ pthread_rwlock_timedrdlock:
je .Lreltmo je .Lreltmo
#endif #endif
cmpq $0, (%r13)
js 16f /* Time is already up. */
movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, %esi movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, %esi
xorl PSHARED(%r12), %esi xorl PSHARED(%r12), %esi
movq %r13, %r10 movq %r13, %r10

5
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -99,6 +99,9 @@ pthread_rwlock_timedwrlock:
je .Lreltmo je .Lreltmo
#endif #endif
cmpq $0, (%r13)
js 16f /* Time is already up. */
movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, %esi movl $FUTEX_PRIVATE_FLAG|FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, %esi
xorl PSHARED(%r12), %esi xorl PSHARED(%r12), %esi
movq %r13, %r10 movq %r13, %r10

18
nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. /* Copyright (C) 2002,2003,2005,2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -77,6 +77,9 @@ sem_timedwait:
je .Lreltmo je .Lreltmo
#endif #endif
cmpq $0, (%rsi)
js 16f
/* This push is only needed to store the sem_t pointer for the /* This push is only needed to store the sem_t pointer for the
exception handler. */ exception handler. */
pushq %rdi pushq %rdi
@ -169,6 +172,19 @@ sem_timedwait:
retq retq
16:
#if USE___THREAD
movq errno@gottpoff(%rip), %rdx
movl $ETIMEDOUT, %fs:(%rdx)
#else
callq __errno_location@plt
movl $ETIMEDOUT, (%rax)
#endif
orl $-1, %eax
retq
#ifndef __ASSUME_FUTEX_CLOCK_REALTIME #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo: .Lreltmo:
pushq %r12 pushq %r12