qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Lukasz Majewski 2020-03-16 10:09:13 +01:00
parent 1959ed4b9e
commit e008836c4a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inet/deadline.c
View File

@ -28,8 +28,8 @@ struct deadline_current_time
__deadline_current_time (void) __deadline_current_time (void)
{ {
struct deadline_current_time result; struct deadline_current_time result;
if (__clock_gettime (CLOCK_MONOTONIC, &result.current) != 0) if (__clock_gettime64 (CLOCK_MONOTONIC, &result.current) != 0)
__clock_gettime (CLOCK_REALTIME, &result.current); __clock_gettime64 (CLOCK_REALTIME, &result.current);
assert (result.current.tv_sec >= 0); assert (result.current.tv_sec >= 0);
return result; return result;
} }

5
inet/net-internal.h
View File

@ -24,6 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include <sys/time.h> #include <sys/time.h>
#include <libc-diag.h> #include <libc-diag.h>
#include <struct___timespec64.h>
int __inet6_scopeid_pton (const struct in6_addr *address, int __inet6_scopeid_pton (const struct in6_addr *address,
const char *scope, uint32_t *result); const char *scope, uint32_t *result);
@ -76,7 +77,7 @@ enum idna_name_classification __idna_name_classify (const char *name)
timeouts and vice versa. */ timeouts and vice versa. */
struct deadline_current_time struct deadline_current_time
{ {
struct timespec current; struct __timespec64 current;
}; };
/* Return the current time. Terminates the process if the 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. */ /* Computed absolute deadline. */
struct deadline struct deadline
{ {
struct timespec absolute; struct __timespec64 absolute;
}; };