diff options
| author | Lukasz Majewski <lukma@denx.de> | 2020-04-22 10:49:39 +0200 |
|---|---|---|
| committer | Lukasz Majewski <lukma@denx.de> | 2020-05-20 01:09:16 +0200 |
| commit | 4c4fc04826c2e02635c65163efb1244148735c41 (patch) | |
| tree | 74405872e21b54ea0e9eb3e841844683075fcb25 /sysdeps | |
| parent | 5613afe9e3dff54b10e4850804cd574e8c420e3d (diff) | |
| download | glibc-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')
| -rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/timex.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ntp_gettimex.c | 26 |
2 files changed, 26 insertions, 3 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 diff --git a/sysdeps/unix/sysv/linux/ntp_gettimex.c b/sysdeps/unix/sysv/linux/ntp_gettimex.c index 0f26d4806e..158ac86031 100644 --- a/sysdeps/unix/sysv/linux/ntp_gettimex.c +++ b/sysdeps/unix/sysv/linux/ntp_gettimex.c @@ -15,21 +15,24 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <time.h> #include <sys/timex.h> #ifndef MOD_OFFSET # define modes mode #endif +/* clock_adjtime64 with CLOCK_REALTIME does not trigger EINVAL, + ENODEV, or EOPNOTSUPP. It might still trigger EPERM. */ int -ntp_gettimex (struct ntptimeval *ntv) +__ntp_gettimex64 (struct __ntptimeval64 *ntv) { - struct timex tntx; + struct __timex64 tntx; int result; tntx.modes = 0; - result = __adjtimex (&tntx); + result = __clock_adjtime64 (CLOCK_REALTIME, &tntx); ntv->time = tntx.time; ntv->maxerror = tntx.maxerror; ntv->esterror = tntx.esterror; @@ -40,3 +43,20 @@ ntp_gettimex (struct ntptimeval *ntv) ntv->__glibc_reserved4 = 0; return result; } + +#if __TIMESIZE != 64 +libc_hidden_def (__ntp_gettimex64) + +int +__ntp_gettimex (struct ntptimeval *ntv) +{ + struct __ntptimeval64 ntv64; + int result; + + result = __ntp_gettimex64 (&ntv64); + *ntv = valid_ntptimeval64_to_ntptimeval (ntv64); + + return result; +} +#endif +strong_alias (__ntp_gettimex, ntp_gettimex) |