diff options
author | Lukasz Majewski <lukma@denx.de> | 2019-11-08 13:15:27 +0100 |
---|---|---|
committer | Lukasz Majewski <lukma@denx.de> | 2019-12-05 23:16:54 +0100 |
commit | cae1635a70aff76117e3b4d6cead86606662b0fc (patch) | |
tree | bd60f8e5629c3478fc469e03f4e8c9ef46fff4ff /include/time.h | |
parent | 562cdc19c761b6749ae31845156366d4b319e200 (diff) | |
download | glibc-cae1635a70aff76117e3b4d6cead86606662b0fc.tar glibc-cae1635a70aff76117e3b4d6cead86606662b0fc.tar.gz glibc-cae1635a70aff76117e3b4d6cead86606662b0fc.tar.bz2 glibc-cae1635a70aff76117e3b4d6cead86606662b0fc.zip |
y2038: linux: Provide __timer_settime64 implementation
This patch provides new __timer_settime64 explicit 64 bit function for setting
flags, interval and value of specified timer.
Moreover, a 32 bit version - __timer_settime has been refactored to internally
use __timer_settime64.
The __timer_settime is now supposed to be used on systems still supporting 32
bit time (__TIMESIZE != 64) - hence the necessary conversion to 64 bit struct
__timespec64 from struct timespec (and opposite when old_value pointer is
provided).
The new __timer_settime64 syscall available from Linux 5.1+ has been used, when
applicable.
The original INLINE_SYSCALL() macro has been replaced with
INLINE_SYSCALL_CALL() to avoid explicit passing the number of arguments.
Build tests:
- The code has been tested on x86_64/x86 (native compilation):
make PARALLELMFLAGS="-j8" && make check PARALLELMFLAGS="-j8" && \\
make xcheck PARALLELMFLAGS="-j8"
- The glibc has been build tested (make PARALLELMFLAGS="-j8") for
x86 (i386), x86_64-x32, and armv7
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
- Use of cross-test-ssh.sh for ARM (armv7):
make PARALLELMFLAGS="-j8" test-wrapper='./cross-test-ssh.sh root@192.168.7.2' xcheck
Linux kernel, headers and minimal kernel version for glibc build test
matrix:
- Linux v5.1 (with timer_settime64) and glibc build with v5.1 as
minimal kernel version (--enable-kernel="5.1.0")
The __ASSUME_TIME64_SYSCALLS flag defined.
- Linux v5.1 and default minimal kernel version
The __ASSUME_TIME64_SYSCALLS not defined, but kernel supports timer_settime64
syscall.
- Linux v4.19 (no timer_settime64 support) with default minimal kernel version
for contemporary glibc (3.2.0)
This kernel doesn't support timer_settime64 syscall, so the fallback to
timer_settime is tested.
Above tests were performed with Y2038 redirection applied as well as without
(so the __TIMESIZE != 64 execution path is checked as well).
No regressions were observed.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include/time.h')
-rw-r--r-- | include/time.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/time.h b/include/time.h index 51c0fce580..e5e8246eac 100644 --- a/include/time.h +++ b/include/time.h @@ -186,6 +186,15 @@ extern int __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value); libc_hidden_proto (__timer_gettime64); #endif +#if __TIMESIZE == 64 +# define __timer_settime64 __timer_settime +#else +extern int __timer_settime64 (timer_t timerid, int flags, + const struct __itimerspec64 *value, + struct __itimerspec64 *ovalue); +libc_hidden_proto (__timer_settime64); +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. |