mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +03:00
y2038: Add support for 64-bit time on legacy ABIs
A new build flag, _TIME_BITS, enables the usage of the newer 64-bit time symbols for legacy ABI (where 32-bit time_t is default). The 64 bit time support is only enabled if LFS (_FILE_OFFSET_BITS=64) is also used. Different than LFS support, the y2038 symbols are added only for the required ABIs (armhf, csky, hppa, i386, m68k, microblaze, mips32, mips64-n32, nios2, powerpc32, sparc32, s390-32, and sh). The ABIs with 64-bit time support are unchanged, both for symbol and types redirection. On Linux the full 64-bit time support requires a minimum of kernel version v5.1. Otherwise, the 32-bit fallbacks are used and might results in error with overflow return code (EOVERFLOW). The i686-gnu does not yet support 64-bit time. This patch exports following rediretions to support 64-bit time: * libc: adjtime adjtimex clock_adjtime clock_getres clock_gettime clock_nanosleep clock_settime cnd_timedwait ctime ctime_r difftime fstat fstatat futimens futimes futimesat getitimer getrusage gettimeofday gmtime gmtime_r localtime localtime_r lstat_time lutimes mktime msgctl mtx_timedlock nanosleep nanosleep ntp_gettime ntp_gettimex ppoll pselec pselect pthread_clockjoin_np pthread_cond_clockwait pthread_cond_timedwait pthread_mutex_clocklock pthread_mutex_timedlock pthread_rwlock_clockrdlock pthread_rwlock_clockwrlock pthread_rwlock_timedrdlock pthread_rwlock_timedwrlock pthread_timedjoin_np recvmmsg sched_rr_get_interval select sem_clockwait semctl semtimedop sem_timedwait setitimer settimeofday shmctl sigtimedwait stat thrd_sleep time timegm timerfd_gettime timerfd_settime timespec_get utime utimensat utimes utimes wait3 wait4 * librt: aio_suspend mq_timedreceive mq_timedsend timer_gettime timer_settime * libanl: gai_suspend Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
@@ -221,6 +221,7 @@ extern int pthread_join (pthread_t __th, void **__thread_return);
|
||||
the thread in *THREAD_RETURN, if THREAD_RETURN is not NULL. */
|
||||
extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW;
|
||||
|
||||
# ifndef __USE_TIME_BITS64
|
||||
/* Make calling thread wait for termination of the thread TH, but only
|
||||
until TIMEOUT. The exit status of the thread is stored in
|
||||
*THREAD_RETURN, if THREAD_RETURN is not NULL.
|
||||
@@ -240,6 +241,23 @@ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return,
|
||||
extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__abstime);
|
||||
# else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (pthread_timedjoin_np,
|
||||
(pthread_t __th, void **__thread_return,
|
||||
const struct timespec *__abstime),
|
||||
__pthread_timedjoin_np64);
|
||||
|
||||
extern int __REDIRECT (pthread_clockjoin_np,
|
||||
(pthread_t __th, void **__thread_return,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__abstime),
|
||||
__pthread_clockjoin_np64);
|
||||
# else
|
||||
# define pthread_timedjoin_np __pthread_timedjoin_np64
|
||||
# define pthread_clockjoin_np __pthread_clockjoin_np64
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.
|
||||
@@ -776,16 +794,39 @@ extern int pthread_mutex_lock (pthread_mutex_t *__mutex)
|
||||
|
||||
#ifdef __USE_XOPEN2K
|
||||
/* Wait until lock becomes available, or specified time passes. */
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 2));
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_mutex_timedlock,
|
||||
(pthread_mutex_t *__restrict __mutex,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_mutex_timedlock64) __nonnull ((1, 2));
|
||||
# else
|
||||
# define pthread_mutex_timedlock __pthread_mutex_timedlock64
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef __USE_GNU
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_mutex_clocklock (pthread_mutex_t *__restrict __mutex,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 3));
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_mutex_clocklock,
|
||||
(pthread_mutex_t *__restrict __mutex,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_mutex_clocklock64) __nonnull ((1, 3));
|
||||
# else
|
||||
# define pthread_mutex_clocklock __pthread_mutex_clocklock64
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Unlock a mutex. */
|
||||
@@ -939,16 +980,41 @@ extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock)
|
||||
|
||||
# ifdef __USE_XOPEN2K
|
||||
/* Try to acquire read lock for RWLOCK or return after specfied time. */
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 2));
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_rwlock_timedrdlock,
|
||||
(pthread_rwlock_t *__restrict __rwlock,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_rwlock_timedrdlock64)
|
||||
__nonnull ((1, 2));
|
||||
# else
|
||||
# define pthread_rwlock_timedrdlock __pthread_rwlock_timedrdlock64
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef __USE_GNU
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_rwlock_clockrdlock (pthread_rwlock_t *__restrict __rwlock,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 3));
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_rwlock_clockrdlock,
|
||||
(pthread_rwlock_t *__restrict __rwlock,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_rwlock_clockrdlock64)
|
||||
__nonnull ((1, 3));
|
||||
# else
|
||||
# define pthread_rwlock_clockrdlock __pthread_rwlock_clockrdlock64
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* Acquire write lock for RWLOCK. */
|
||||
@@ -961,16 +1027,42 @@ extern int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock)
|
||||
|
||||
# ifdef __USE_XOPEN2K
|
||||
/* Try to acquire write lock for RWLOCK or return after specfied time. */
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 2));
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_rwlock_timedwrlock,
|
||||
(pthread_rwlock_t *__restrict __rwlock,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_rwlock_timedwrlock64)
|
||||
__nonnull ((1, 2));
|
||||
# else
|
||||
# define pthread_rwlock_timedwrlock __pthread_rwlock_timedwrlock64
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef __USE_GNU
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_rwlock_clockwrlock (pthread_rwlock_t *__restrict __rwlock,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict
|
||||
__abstime) __THROWNL __nonnull ((1, 3));
|
||||
|
||||
# else
|
||||
# ifdef __REDIRECT_NTHNL
|
||||
extern int __REDIRECT_NTHNL (pthread_rwlock_clockwrlock,
|
||||
(pthread_rwlock_t *__restrict __rwlock,
|
||||
clockid_t __clockid,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_rwlock_clockwrlock64)
|
||||
__nonnull ((1, 3));
|
||||
# else
|
||||
# define pthread_rwlock_clockwrlock __pthread_rwlock_clockwrlock64
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* Unlock RWLOCK. */
|
||||
@@ -1047,10 +1139,23 @@ extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
|
||||
pthread_mutex_t *__restrict __mutex,
|
||||
const struct timespec *__restrict __abstime)
|
||||
__nonnull ((1, 2, 3));
|
||||
# else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (pthread_cond_timedwait,
|
||||
(pthread_cond_t *__restrict __cond,
|
||||
pthread_mutex_t *__restrict __mutex,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_cond_timedwait64)
|
||||
__nonnull ((1, 2, 3));
|
||||
# else
|
||||
# define pthread_cond_timedwait __pthread_cond_timedwait64
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef __USE_GNU
|
||||
/* Wait for condition variable COND to be signaled or broadcast until
|
||||
@@ -1060,11 +1165,25 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
# ifndef __USE_TIME_BITS64
|
||||
extern int pthread_cond_clockwait (pthread_cond_t *__restrict __cond,
|
||||
pthread_mutex_t *__restrict __mutex,
|
||||
__clockid_t __clock_id,
|
||||
const struct timespec *__restrict __abstime)
|
||||
__nonnull ((1, 2, 4));
|
||||
# else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT (pthread_cond_clockwait,
|
||||
(pthread_cond_t *__restrict __cond,
|
||||
pthread_mutex_t *__restrict __mutex,
|
||||
__clockid_t __clock_id,
|
||||
const struct timespec *__restrict __abstime),
|
||||
__pthread_cond_clockwait64)
|
||||
__nonnull ((1, 2, 4));
|
||||
# else
|
||||
# define pthread_cond_clockwait __pthread_cond_clockwait64
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* Functions for handling condition variable attributes. */
|
||||
|
Reference in New Issue
Block a user