From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Florian Weimer <fweimer@redhat.com>,
GNU C Library <libc-alpha@sourceware.org>,
Andreas Schwab <schwab@suse.de>,
Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH v2 7/7] y2038: linux: Provide __ntp_gettimex64 implementation
Date: Fri, 8 May 2020 16:56:40 +0200 [thread overview]
Message-ID: <20200508145640.16336-8-lukma@denx.de> (raw)
In-Reply-To: <20200508145640.16336-1-lukma@denx.de>
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.
---
sysdeps/unix/sysv/linux/include/sys/timex.h | 3 +++
sysdeps/unix/sysv/linux/ntp_gettimex.c | 24 ++++++++++++++++++---
2 files changed, 24 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..7d0328c6ca 100644
--- a/sysdeps/unix/sysv/linux/ntp_gettimex.c
+++ b/sysdeps/unix/sysv/linux/ntp_gettimex.c
@@ -15,6 +15,7 @@
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
@@ -23,13 +24,13 @@
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 +41,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)
--
2.20.1
next prev parent reply other threads:[~2020-05-08 14:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 14:56 [PATCH v2 0/7] y2038: Convert clock_adjtime related syscalls to support 64 bit time Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 1/7] y2038: linux: Provide __clock_adjtime64 implementation Lukasz Majewski
2020-05-15 10:03 ` Lukasz Majewski
2020-05-19 19:07 ` Adhemerval Zanella via Libc-alpha
2020-05-19 19:58 ` Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 2/7] y2038: linux: Provide ___adjtimex64 implementation Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 3/7] y2038: linux: Provide __adjtime64 implementation Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 4/7] y2038: Introduce struct __ntptimeval64 - new internal glibc type Lukasz Majewski
2020-05-19 19:10 ` Adhemerval Zanella via Libc-alpha
2020-05-08 14:56 ` [PATCH v2 5/7] y2038: Provide conversion helpers for struct __ntptimeval64 Lukasz Majewski
2020-05-19 19:12 ` Adhemerval Zanella via Libc-alpha
2020-05-08 14:56 ` [PATCH v2 6/7] y2038: linux: Provide __ntp_gettime64 implementation Lukasz Majewski
2020-05-19 19:18 ` Adhemerval Zanella via Libc-alpha
2020-05-19 20:20 ` Lukasz Majewski
2020-05-19 20:25 ` Adhemerval Zanella via Libc-alpha
2020-05-20 15:23 ` Joseph Myers
2020-05-20 17:08 ` Lukasz Majewski
2020-05-20 17:21 ` Joseph Myers
2020-05-21 10:31 ` Lukasz Majewski
2020-05-08 14:56 ` Lukasz Majewski [this message]
2020-05-19 19:19 ` [PATCH v2 7/7] y2038: linux: Provide __ntp_gettimex64 implementation Adhemerval Zanella via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200508145640.16336-8-lukma@denx.de \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).