mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
b8d3e8fbaa
The sem_clockwait and sem_timedwait have been converted to support 64 bit time.
This change reuses futex_abstimed_wait_cancelable64 function introduced earlier.
The sem_{clock|timed}wait only accepts absolute time. Moreover, there is no
need to check for NULL passed as *abstime pointer to the syscalls as both calls
have exported symbols marked with __nonull attribute for abstime.
For systems with __TIMESIZE != 64 && __WORDSIZE == 32:
- Conversion from 32 bit time to 64 bit struct __timespec64 was necessary
- Redirection to __sem_{clock|timed}wait64 will provide support for 64 bit
time
Build tests:
./src/scripts/build-many-glibcs.py glibcs
Run-time tests:
- Run specific tests on ARM/x86 32bit systems (qemu):
https://github.com/lmajewski/meta-y2038 and run tests:
https://github.com/lmajewski/y2038-tests/commits/master
Above tests were performed with Y2038 redirection applied as well as without
to test the proper usage of both __sem_{clock|timed}wait64 and
__sem_{clock|timed}wait.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
57 lines
1.8 KiB
C
57 lines
1.8 KiB
C
/* sem_timedwait -- wait on a semaphore with timeout.
|
|
Copyright (C) 2003-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Paul Mackerras <paulus@au.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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <time.h>
|
|
#include "semaphoreP.h"
|
|
#include "sem_waitcommon.c"
|
|
|
|
/* This is in a separate file because because sem_timedwait is only provided
|
|
if __USE_XOPEN2K is defined. */
|
|
int
|
|
__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime)
|
|
{
|
|
if (! valid_nanoseconds (abstime->tv_nsec))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
/* Check sem_wait.c for a more detailed explanation why it is required. */
|
|
__pthread_testcancel ();
|
|
|
|
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
|
|
return 0;
|
|
else
|
|
return __new_sem_wait_slow64 ((struct new_sem *) sem,
|
|
CLOCK_REALTIME, abstime);
|
|
}
|
|
|
|
#if __TIMESIZE != 64
|
|
libpthread_hidden_def (__sem_timedwait64)
|
|
|
|
int
|
|
__sem_timedwait (sem_t *sem, const struct timespec *abstime)
|
|
{
|
|
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
|
|
|
|
return __sem_timedwait64 (sem, &ts64);
|
|
}
|
|
#endif
|
|
weak_alias (__sem_timedwait, sem_timedwait)
|