public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] y2038: inet: Convert inet deadline to support 64 bit time
Date: Tue,  5 May 2020 22:57:48 +0000 (GMT)	[thread overview]
Message-ID: <20200505225748.15BF7389087D@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e008836c4afeeb81abe548b898fdf2db7d70eaff

commit e008836c4afeeb81abe548b898fdf2db7d70eaff
Author: Lukasz Majewski <lukma@denx.de>
Date:   Mon Mar 16 10:09:13 2020 +0100

    y2038: inet: Convert inet deadline to support 64 bit time
    
    This change brings 64 bit time support to inet deadline related code for
    architectures with __WORDSIZE == 32 && __TIMESIZE != 64.
    
    It is also safe to replace struct timespec with struct __timespec64 in
    deadline related structures as:
    
    - The __deadline_to_ms () returns the number of miliseconds to deadline to
      be used with __poll (and hence it is a relative value).
    - To calculate the deadline from timeval (which will be converted latter)
      the uintmax_t type is used (unsinged long long int).
    
    Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

Diff:
---
 inet/deadline.c     | 4 ++--
 inet/net-internal.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/inet/deadline.c b/inet/deadline.c
index ebf9a4f52c..eac7afd1a8 100644
--- a/inet/deadline.c
+++ b/inet/deadline.c
@@ -28,8 +28,8 @@ struct deadline_current_time
 __deadline_current_time (void)
 {
   struct deadline_current_time result;
-  if (__clock_gettime (CLOCK_MONOTONIC, &result.current) != 0)
-    __clock_gettime (CLOCK_REALTIME, &result.current);
+  if (__clock_gettime64 (CLOCK_MONOTONIC, &result.current) != 0)
+    __clock_gettime64 (CLOCK_REALTIME, &result.current);
   assert (result.current.tv_sec >= 0);
   return result;
 }
diff --git a/inet/net-internal.h b/inet/net-internal.h
index 3ca301a9be..50c7e1c482 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <sys/time.h>
 #include <libc-diag.h>
+#include <struct___timespec64.h>
 
 int __inet6_scopeid_pton (const struct in6_addr *address,
                           const char *scope, uint32_t *result);
@@ -76,7 +77,7 @@ enum idna_name_classification __idna_name_classify (const char *name)
    timeouts and vice versa.  */
 struct deadline_current_time
 {
-  struct timespec current;
+  struct __timespec64 current;
 };
 
 /* Return the current time.  Terminates the process if the current
@@ -86,7 +87,7 @@ struct deadline_current_time __deadline_current_time (void) attribute_hidden;
 /* Computed absolute deadline.  */
 struct deadline
 {
-  struct timespec absolute;
+  struct __timespec64 absolute;
 };


                 reply	other threads:[~2020-05-05 22:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200505225748.15BF7389087D@sourceware.org \
    --to=lukma@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /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).