AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: pthread_rwlock: Move timeout validation into _full functions

Browse Source 
As recommended by the comments in the implementations of
pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock, let's move
the timeout validity checks into the corresponding pthread_rwlock_rdlock_full
and pthread_rwlock_wrlock_full functions. Since these functions may be
called with abstime == NULL, an extra check for that is necessary too.

	* nptl/pthread_rwlock_common.c (__pthread_rwlock_rdlock_full):
	Check validity of abstime parameter.
	(__pthread_rwlock_rwlock_full): Likewise.
	* nptl/pthread_rwlock_timedrdlock.c
	* (pthread_rwlock_timedrdlock):
	Remove check for validity of abstime parameter.
	* nptl/pthread_rwlock_timedwrlock.c
	* (pthread_rwlock_timedwrlock):
	Likewise.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Mike Crowe 2019-06-24 12:39:02 +00:00 committed by Adhemerval Zanella
parent afe4de7d28
commit 600b4be4d9
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
2019-07-12 Mike Crowe <mac@mcrowe.com>
nptl: pthread_rwlock: Move timeout validation into _full functions
* nptl/pthread_rwlock_common.c (__pthread_rwlock_rdlock_full):
Check validity of abstime parameter.
(__pthread_rwlock_rwlock_full): Likewise.
* nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock):
Remove check for validity of abstime parameter.
* nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock):
Likewise.
nptl: Add POSIX-proposed pthread_cond_clockwait which behaves just
like pthread_cond_timedwait except it always measures abstime
against the supplied clockid.

20
nptl/pthread_rwlock_common.c
View File

@ -282,6 +282,16 @@ __pthread_rwlock_rdlock_full (pthread_rwlock_t *rwlock,
{
unsigned int r;
/* Make sure any passed in timeout value is valid. Note that the previous
implementation assumed that this check *must* not be performed if there
would in fact be no blocking; however, POSIX only requires that "the
validity of the abstime parameter need not be checked if the lock can be
immediately acquired" (i.e., we need not but may check it). */
if (abstime
&& __glibc_unlikely (abstime->tv_nsec >= 1000000000
|| abstime->tv_nsec < 0))
return EINVAL;
/* Make sure we are not holding the rwlock as a writer. This is a deadlock
situation we recognize and report. */
if (__glibc_unlikely (atomic_load_relaxed (&rwlock->__data.__cur_writer)
@ -576,6 +586,16 @@ static __always_inline int
__pthread_rwlock_wrlock_full (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
/* Make sure any passed in timeout value is valid. Note that the previous
implementation assumed that this check *must* not be performed if there
would in fact be no blocking; however, POSIX only requires that "the
validity of the abstime parameter need not be checked if the lock can be
immediately acquired" (i.e., we need not but may check it). */
if (abstime
&& __glibc_unlikely (abstime->tv_nsec >= 1000000000
|| abstime->tv_nsec < 0))
return EINVAL;
/* Make sure we are not holding the rwlock as a writer. This is a deadlock
situation we recognize and report. */
if (__glibc_unlikely (atomic_load_relaxed (&rwlock->__data.__cur_writer)

10
nptl/pthread_rwlock_timedrdlock.c
View File

@ -23,15 +23,5 @@ int
pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
/* Make sure the passed in timeout value is valid. Note that the previous
implementation assumed that this check *must* not be performed if there
would in fact be no blocking; however, POSIX only requires that "the
validity of the abstime parameter need not be checked if the lock can be
immediately acquired" (i.e., we need not but may check it). */
/* ??? Just move this to __pthread_rwlock_rdlock_full? */
if (__glibc_unlikely (abstime->tv_nsec >= 1000000000
|| abstime->tv_nsec < 0))
return EINVAL;
return __pthread_rwlock_rdlock_full (rwlock, abstime);
}

10
nptl/pthread_rwlock_timedwrlock.c
View File

@ -23,15 +23,5 @@ int
pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
/* Make sure the passed in timeout value is valid. Note that the previous
implementation assumed that this check *must* not be performed if there
would in fact be no blocking; however, POSIX only requires that "the
validity of the abstime parameter need not be checked if the lock can be
immediately acquired" (i.e., we need not but may check it). */
/* ??? Just move this to __pthread_rwlock_wrlock_full? */
if (__glibc_unlikely (abstime->tv_nsec >= 1000000000
|| abstime->tv_nsec < 0))
return EINVAL;
return __pthread_rwlock_wrlock_full (rwlock, abstime);
}