lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

y2038: linux: Provide __ntp_gettimex64 implementation

Browse Source 
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>
This commit is contained in:
Lukasz Majewski
2020-04-22 10:49:39 +02:00
parent 5613afe9e3
commit 4c4fc04826
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/unix/sysv/linux/include/sys/timex.h
View File

@ -34,6 +34,7 @@ libc_hidden_proto (__adjtimex)
# define ___adjtimex64 ___adjtimex # define ___adjtimex64 ___adjtimex
# define __ntptimeval64 ntptimeval # define __ntptimeval64 ntptimeval
# define __ntp_gettime64 __ntp_gettime # define __ntp_gettime64 __ntp_gettime
# define __ntp_gettimex64 __ntp_gettimex
# else # else
struct __timex64 struct __timex64
@ -94,6 +95,8 @@ struct __ntptimeval64
}; };
extern int __ntp_gettime64 (struct __ntptimeval64 *ntv); extern int __ntp_gettime64 (struct __ntptimeval64 *ntv);
libc_hidden_proto (__ntp_gettime64) libc_hidden_proto (__ntp_gettime64)
extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv);
libc_hidden_proto (__ntp_gettimex64)
# endif # endif

26
sysdeps/unix/sysv/linux/ntp_gettimex.c
View File

@ -15,21 +15,24 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <time.h>
#include <sys/timex.h> #include <sys/timex.h>
#ifndef MOD_OFFSET #ifndef MOD_OFFSET
# define modes mode # define modes mode
#endif #endif
/* clock_adjtime64 with CLOCK_REALTIME does not trigger EINVAL,
ENODEV, or EOPNOTSUPP. It might still trigger EPERM. */
int int
ntp_gettimex (struct ntptimeval *ntv) __ntp_gettimex64 (struct __ntptimeval64 *ntv)
{ {
struct timex tntx; struct __timex64 tntx;
int result; int result;
tntx.modes = 0; tntx.modes = 0;
result = __adjtimex (&tntx); result = __clock_adjtime64 (CLOCK_REALTIME, &tntx);
ntv->time = tntx.time; ntv->time = tntx.time;
ntv->maxerror = tntx.maxerror; ntv->maxerror = tntx.maxerror;
ntv->esterror = tntx.esterror; ntv->esterror = tntx.esterror;
@ -40,3 +43,20 @@ ntp_gettimex (struct ntptimeval *ntv)
ntv->__glibc_reserved4 = 0; ntv->__glibc_reserved4 = 0;
return result; 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)