public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>,
	Paul Eggert <eggert@cs.ucla.edu>,
	Adhemerval Zanella <adhemerval.zanella@linaro.org>,
	Andreas Schwab <schwab@suse.de>,
	Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Alistair Francis <alistair23@gmail.com>,
	Alistair Francis <alistair.francis@wdc.com>,
	GNU C Library <libc-alpha@sourceware.org>,
	Siddhesh Poyarekar <siddhesh@gotplt.org>,
	Florian Weimer <fweimer@redhat.com>,
	Florian Weimer <fw@deneb.enyo.de>,
	Zack Weinberg <zackw@panix.com>,
	Carlos O'Donell <carlos@redhat.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [PATCH 2/2] y2038: linux: Provide __timespec_get64 implementation
Date: Thu, 16 Jan 2020 13:28:00 -0000	[thread overview]
Message-ID: <20200116132728.11646-2-lukma@denx.de> (raw)
In-Reply-To: <20200116132728.11646-1-lukma@denx.de>

This patch provides new __timespec_get64 explicit 64 bit function for getting
64 bit time in the struct __timespec64 (for compilation supporting C11).
Moreover, a 32 bit version - __timespec_get has been refactored to internally
use __timespec_get64.

The __timespec_get is now supposed to be used on systems still supporting 32
bit time (__TIMESIZE != 64) - hence the necessary conversion to 32 bit struct
timespec.

Internally the timespec_get uses __clock_gettime64. This patch is necessary
for having architectures with __WORDSIZE == 32 Y2038 safe.

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 proper usage of both __timespec_get64 and __timespec_get.
---
 include/time.h      |  3 +++
 time/timespec_get.c | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/include/time.h b/include/time.h
index 558923274a..047f431a1a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -254,6 +254,7 @@ extern double __difftime (time_t time1, time_t time0);
 #if __TIMESIZE == 64
 # define __clock_nanosleep_time64 __clock_nanosleep
 # define __clock_gettime64 __clock_gettime
+# define __timespec_get64 __timespec_get
 #else
 extern int __clock_nanosleep_time64 (clockid_t clock_id,
                                      int flags, const struct __timespec64 *req,
@@ -261,6 +262,8 @@ extern int __clock_nanosleep_time64 (clockid_t clock_id,
 libc_hidden_proto (__clock_nanosleep_time64)
 extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp);
 libc_hidden_proto (__clock_gettime64)
+extern int __timespec_get64 (struct __timespec64 *ts, int base);
+libc_hidden_proto (__timespec_get64)
 #endif
 
 /* Use in the clock_* functions.  Size of the field representing the
diff --git a/time/timespec_get.c b/time/timespec_get.c
index a1ec4167da..98f0aaf700 100644
--- a/time/timespec_get.c
+++ b/time/timespec_get.c
@@ -16,16 +16,43 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <time.h>
-
+#include <errno.h>
 
 /* Set TS to calendar time based in time base BASE.  */
 int
-timespec_get (struct timespec *ts, int base)
+__timespec_get64 (struct __timespec64 *ts, int base)
 {
   if (base == TIME_UTC)
     {
-      __clock_gettime (CLOCK_REALTIME, ts);
+      __clock_gettime64 (CLOCK_REALTIME, ts);
       return base;
     }
   return 0;
 }
+
+#if __TIMESIZE != 64
+libc_hidden_def (__timespec_get64)
+
+int
+__timespec_get (struct timespec *ts, int base)
+{
+  int ret;
+  struct __timespec64 tp64;
+
+  ret = __timespec_get64 (&tp64, base);
+
+  if (ret == TIME_UTC)
+    {
+      if (! in_time_t_range (tp64.tv_sec))
+        {
+          __set_errno (EOVERFLOW);
+          return 0;
+        }
+
+      *ts = valid_timespec64_to_timespec (tp64);
+    }
+
+  return ret;
+}
+#endif
+strong_alias (__timespec_get, timespec_get);
-- 
2.20.1

  reply	other threads:[~2020-01-16 13:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16 13:35 [PATCH 1/2] y2038: hurd: Provide __clock_gettime64 function Lukasz Majewski
2020-01-16 13:28 ` Lukasz Majewski [this message]
2020-01-16 22:17 ` Samuel Thibault

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200116132728.11646-2-lukma@denx.de \
    --to=lukma@denx.de \
    --cc=adhemerval.zanella@linaro.org \
    --cc=alistair.francis@wdc.com \
    --cc=alistair23@gmail.com \
    --cc=carlos@redhat.com \
    --cc=eggert@cs.ucla.edu \
    --cc=fw@deneb.enyo.de \
    --cc=fweimer@redhat.com \
    --cc=joseph@codesourcery.com \
    --cc=libc-alpha@sourceware.org \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=schwab@suse.de \
    --cc=siddhesh@gotplt.org \
    --cc=zackw@panix.com \
    /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).