mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +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.
157 lines
4.5 KiB
C
157 lines
4.5 KiB
C
/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
|
|
|
|
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 <pthread.h>
|
|
#include <pthreadP.h>
|
|
#include <kernel-features.h>
|
|
|
|
|
|
/* Try to acquire read lock for RWLOCK or return after specfied time. */
|
|
int
|
|
pthread_rwlock_timedrdlock (rwlock, abstime)
|
|
pthread_rwlock_t *rwlock;
|
|
const struct timespec *abstime;
|
|
{
|
|
int result = 0;
|
|
|
|
/* Make sure we are alone. */
|
|
lll_lock(rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
while (1)
|
|
{
|
|
int err;
|
|
|
|
/* Get the rwlock if there is no writer... */
|
|
if (rwlock->__data.__writer == 0
|
|
/* ...and if either no writer is waiting or we prefer readers. */
|
|
&& (!rwlock->__data.__nr_writers_queued
|
|
|| PTHREAD_RWLOCK_PREFER_READER_P (rwlock)))
|
|
{
|
|
/* Increment the reader counter. Avoid overflow. */
|
|
if (++rwlock->__data.__nr_readers == 0)
|
|
{
|
|
/* Overflow on number of readers. */
|
|
--rwlock->__data.__nr_readers;
|
|
result = EAGAIN;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
/* Make sure we are not holding the rwlock as a writer. This is
|
|
a deadlock situation we recognize and report. */
|
|
if (__builtin_expect (rwlock->__data.__writer
|
|
== THREAD_GETMEM (THREAD_SELF, tid), 0))
|
|
{
|
|
result = EDEADLK;
|
|
break;
|
|
}
|
|
|
|
/* Make sure the passed in timeout value is valid. Ideally this
|
|
test would be executed once. But since it must not be
|
|
performed if we would not block at all simply moving the test
|
|
to the front is no option. Replicating all the code is
|
|
costly while this test is not. */
|
|
if (__builtin_expect (abstime->tv_nsec >= 1000000000
|
|
|| abstime->tv_nsec < 0, 0))
|
|
{
|
|
result = EINVAL;
|
|
break;
|
|
}
|
|
|
|
/* Work around the fact that the kernel rejects negative timeout values
|
|
despite them being valid. */
|
|
if (__glibc_unlikely (abstime->tv_sec < 0))
|
|
{
|
|
result = ETIMEDOUT;
|
|
break;
|
|
}
|
|
|
|
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
|
|
|| !defined lll_futex_timed_wait_bitset)
|
|
/* Get the current time. So far we support only one clock. */
|
|
struct timeval tv;
|
|
(void) gettimeofday (&tv, NULL);
|
|
|
|
/* Convert the absolute timeout value to a relative timeout. */
|
|
struct timespec rt;
|
|
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;
|
|
}
|
|
/* Did we already time out? */
|
|
if (rt.tv_sec < 0)
|
|
{
|
|
/* Yep, return with an appropriate error. */
|
|
result = ETIMEDOUT;
|
|
break;
|
|
}
|
|
#endif
|
|
|
|
/* Remember that we are a reader. */
|
|
if (++rwlock->__data.__nr_readers_queued == 0)
|
|
{
|
|
/* Overflow on number of queued readers. */
|
|
--rwlock->__data.__nr_readers_queued;
|
|
result = EAGAIN;
|
|
break;
|
|
}
|
|
|
|
int waitval = rwlock->__data.__readers_wakeup;
|
|
|
|
/* Free the lock. */
|
|
lll_unlock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
/* Wait for the writer to finish. */
|
|
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
|
|
|| !defined lll_futex_timed_wait_bitset)
|
|
err = lll_futex_timed_wait (&rwlock->__data.__readers_wakeup,
|
|
waitval, &rt, rwlock->__data.__shared);
|
|
#else
|
|
err = lll_futex_timed_wait_bitset (&rwlock->__data.__readers_wakeup,
|
|
waitval, abstime,
|
|
FUTEX_CLOCK_REALTIME,
|
|
rwlock->__data.__shared);
|
|
#endif
|
|
|
|
/* Get the lock. */
|
|
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
--rwlock->__data.__nr_readers_queued;
|
|
|
|
/* Did the futex call time out? */
|
|
if (err == -ETIMEDOUT)
|
|
{
|
|
/* Yep, report it. */
|
|
result = ETIMEDOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* We are done, free the lock. */
|
|
lll_unlock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
return result;
|
|
}
|