mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-03 20:53:13 +03:00
4c4fc04826
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>
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
/* Copyright (C) 1999-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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 <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_gettimex64 (struct __ntptimeval64 *ntv)
|
|
{
|
|
struct __timex64 tntx;
|
|
int result;
|
|
|
|
tntx.modes = 0;
|
|
result = __clock_adjtime64 (CLOCK_REALTIME, &tntx);
|
|
ntv->time = tntx.time;
|
|
ntv->maxerror = tntx.maxerror;
|
|
ntv->esterror = tntx.esterror;
|
|
ntv->tai = tntx.tai;
|
|
ntv->__glibc_reserved1 = 0;
|
|
ntv->__glibc_reserved2 = 0;
|
|
ntv->__glibc_reserved3 = 0;
|
|
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)
|