about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/include/sys
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2020-04-22 10:49:39 +0200
committerLukasz Majewski <lukma@denx.de>2020-05-20 01:09:16 +0200
commit4c4fc04826c2e02635c65163efb1244148735c41 (patch)
tree74405872e21b54ea0e9eb3e841844683075fcb25 /sysdeps/unix/sysv/linux/include/sys
parent5613afe9e3dff54b10e4850804cd574e8c420e3d (diff)
downloadglibc-4c4fc04826c2e02635c65163efb1244148735c41.tar.gz
glibc-4c4fc04826c2e02635c65163efb1244148735c41.tar.xz
glibc-4c4fc04826c2e02635c65163efb1244148735c41.zip
y2038: linux: Provide __ntp_gettimex64 implementation
This patch provides new __ntp_gettimex64 explicit 64 bit function for getting
time parameters via NTP interface.

The call to __adjtimex in __ntp_gettime64 function has been replaced with
direct call to __clock_adjtime64 syscall, to simplify the code.

Moreover, a 32 bit version - __ntp_gettimex has been refactored to internally
use __ntp_gettimex64.

The __ntp_gettimex is now supposed to be used on systems still supporting 32
bit time (__TIMESIZE != 64) - hence the necessary conversions between struct
ntptimeval and 64 bit struct __ntptimeval64.

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 __ntp_gettimex64 and __ntp_gettimex.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/include/sys')
-rw-r--r--sysdeps/unix/sysv/linux/include/sys/timex.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h
index ef53515803..335a38c3bd 100644
--- a/sysdeps/unix/sysv/linux/include/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/include/sys/timex.h
@@ -34,6 +34,7 @@ libc_hidden_proto (__adjtimex)
 #   define ___adjtimex64 ___adjtimex
 #   define __ntptimeval64 ntptimeval
 #   define __ntp_gettime64 __ntp_gettime
+#   define __ntp_gettimex64 __ntp_gettimex
 #  else
 
 struct __timex64
@@ -94,6 +95,8 @@ struct __ntptimeval64
 };
 extern int __ntp_gettime64 (struct __ntptimeval64 *ntv);
 libc_hidden_proto (__ntp_gettime64)
+extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv);
+libc_hidden_proto (__ntp_gettimex64)
 
 #  endif