mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 12:41:05 +00:00
9bc6103d04
This patch makes files using __ASSUME_* macros include <kernel-features.h> explicitly, rather than relying on some other header (such as tls.h, lowlevellock.h or pthreadP.h) to include it implicitly. (I omitted cases where I've already posted or am testing the patch that stops the file from needing __ASSUME_* at all.) This accords with the general principle of making source files include the headers for anything they use, and also helps make it safe to remove <kernel-features.h> includes from any file that doesn't use __ASSUME_* (some of those may be stray includes left behind after increasing the minimum kernel version, others may never have been needed or may have become obsolete after some other change). Tested x86_64 that the disassembly of installed shared libraries is unchanged by this patch. * nptl/pthread_cond_wait.c: Include <kernel-features.h>. * nptl/pthread_rwlock_timedrdlock.c: Likewise. * nptl/pthread_rwlock_timedwrlock.c: Likewise. * nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c: Likewise. * nscd/nscd.c: Likewise. * sysdeps/i386/nptl/tcb-offsets.sym: Likewise. * sysdeps/powerpc/nptl/tcb-offsets.sym: Likewise. * sysdeps/sh/nptl/tcb-offsets.sym: Likewise. * sysdeps/x86_64/nptl/tcb-offsets.sym: Likewise.
129 lines
3.3 KiB
C
129 lines
3.3 KiB
C
/* Copyright (C) 2006-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Jakub Jelinek <jakub@redhat.com>, 2006.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <sys/time.h>
|
|
#include <pthreadP.h>
|
|
#include <kernel-features.h>
|
|
|
|
|
|
int
|
|
__lll_robust_lock_wait (int *futex, int private)
|
|
{
|
|
int oldval = *futex;
|
|
int tid = THREAD_GETMEM (THREAD_SELF, tid);
|
|
|
|
/* If the futex changed meanwhile try locking again. */
|
|
if (oldval == 0)
|
|
goto try;
|
|
|
|
do
|
|
{
|
|
if (__glibc_unlikely (oldval & FUTEX_OWNER_DIED))
|
|
return oldval;
|
|
|
|
int newval = oldval | FUTEX_WAITERS;
|
|
if (oldval != newval
|
|
&& atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
|
|
continue;
|
|
|
|
lll_futex_wait (futex, newval, private);
|
|
|
|
try:
|
|
;
|
|
}
|
|
while ((oldval = atomic_compare_and_exchange_val_acq (futex,
|
|
tid | FUTEX_WAITERS,
|
|
0)) != 0);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
__lll_robust_timedlock_wait (int *futex, const struct timespec *abstime,
|
|
int private)
|
|
{
|
|
/* Reject invalid timeouts. */
|
|
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
|
|
return EINVAL;
|
|
|
|
int tid = THREAD_GETMEM (THREAD_SELF, tid);
|
|
int oldval = *futex;
|
|
|
|
/* If the futex changed meanwhile try locking again. */
|
|
if (oldval == 0)
|
|
goto try;
|
|
|
|
/* Work around the fact that the kernel rejects negative timeout values
|
|
despite them being valid. */
|
|
if (__glibc_unlikely (abstime->tv_sec < 0))
|
|
return ETIMEDOUT;
|
|
|
|
do
|
|
{
|
|
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
|
|
|| !defined lll_futex_timed_wait_bitset)
|
|
struct timeval tv;
|
|
struct timespec rt;
|
|
|
|
/* Get the current time. */
|
|
(void) __gettimeofday (&tv, NULL);
|
|
|
|
/* Compute relative timeout. */
|
|
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
|
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
|
if (rt.tv_nsec < 0)
|
|
{
|
|
rt.tv_nsec += 1000000000;
|
|
--rt.tv_sec;
|
|
}
|
|
|
|
/* Already timed out? */
|
|
if (rt.tv_sec < 0)
|
|
return ETIMEDOUT;
|
|
#endif
|
|
|
|
/* Wait. */
|
|
if (__glibc_unlikely (oldval & FUTEX_OWNER_DIED))
|
|
return oldval;
|
|
|
|
int newval = oldval | FUTEX_WAITERS;
|
|
if (oldval != newval
|
|
&& atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
|
|
continue;
|
|
|
|
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
|
|
|| !defined lll_futex_timed_wait_bitset)
|
|
lll_futex_timed_wait (futex, newval, &rt, private);
|
|
#else
|
|
lll_futex_timed_wait_bitset (futex, newval, abstime,
|
|
FUTEX_CLOCK_REALTIME, private);
|
|
#endif
|
|
|
|
try:
|
|
;
|
|
}
|
|
while ((oldval = atomic_compare_and_exchange_val_acq (futex,
|
|
tid | FUTEX_WAITERS,
|
|
0)) != 0);
|
|
|
|
return 0;
|
|
}
|