Message ID | 20200324131821.22048-5-lukma@denx.de |
---|---|
State | New |
Headers | show |
Series | y2038: Replace __clock_gettime with __clock_gettime64 | expand |
On Tue, Mar 24, 2020 at 6:18 AM Lukasz Majewski <lukma@denx.de> wrote: > > The nscd/nscd_helper.c uses __clock_gettime to get current time and on this > basis calculate the relative timeout for poll. > By using __clock_gettime64 on systems with __WORDSIZE == 32 && __TIMESIZE != 64 > the timeout is correctly calculated after time_t overflow. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > nscd/nscd_helper.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c > index d2d7d15f26..a4f3312f90 100644 > --- a/nscd/nscd_helper.c > +++ b/nscd/nscd_helper.c > @@ -37,6 +37,7 @@ > #include <not-cancel.h> > #include <kernel-features.h> > #include <nss.h> > +#include <struct___timespec64.h> > > #include "nscd-client.h" > > @@ -59,10 +60,10 @@ wait_on_socket (int sock, long int usectmo) > /* Handle the case where the poll() call is interrupted by a > signal. We cannot just use TEMP_FAILURE_RETRY since it might > lead to infinite loops. */ > - struct timespec now; > - __clock_gettime (CLOCK_REALTIME, &now); > - long int end = (now.tv_sec * 1000 + usectmo > - + (now.tv_nsec + 500000) / 1000000); > + struct __timespec64 now; > + __clock_gettime64 (CLOCK_REALTIME, &now); > + int64_t end = (now.tv_sec * 1000 + usectmo > + + (now.tv_nsec + 500000) / 1000000); > long int timeout = usectmo; > while (1) > { > @@ -71,7 +72,7 @@ wait_on_socket (int sock, long int usectmo) > break; > > /* Recompute the timeout time. */ > - __clock_gettime (CLOCK_REALTIME, &now); > + __clock_gettime64 (CLOCK_REALTIME, &now); > timeout = end - ((now.tv_sec * 1000 > + (now.tv_nsec + 500000) / 1000000)); > } > @@ -193,7 +194,7 @@ open_socket (request_type type, const char *key, size_t keylen) > memcpy (reqdata->key, key, keylen); > > bool first_try = true; > - struct timespec tvend = { 0, 0 }; > + struct __timespec64 tvend = { 0, 0 }; > while (1) > { > #ifndef MSG_NOSIGNAL > @@ -212,8 +213,8 @@ open_socket (request_type type, const char *key, size_t keylen) > > /* The daemon is busy wait for it. */ > int to; > - struct timespec now; > - __clock_gettime (CLOCK_REALTIME, &now); > + struct __timespec64 now; > + __clock_gettime64 (CLOCK_REALTIME, &now); > if (first_try) > { > tvend.tv_nsec = now.tv_nsec; > -- > 2.20.1 >
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index d2d7d15f26..a4f3312f90 100644 --- a/nscd/nscd_helper.c +++ b/nscd/nscd_helper.c @@ -37,6 +37,7 @@ #include <not-cancel.h> #include <kernel-features.h> #include <nss.h> +#include <struct___timespec64.h> #include "nscd-client.h" @@ -59,10 +60,10 @@ wait_on_socket (int sock, long int usectmo) /* Handle the case where the poll() call is interrupted by a signal. We cannot just use TEMP_FAILURE_RETRY since it might lead to infinite loops. */ - struct timespec now; - __clock_gettime (CLOCK_REALTIME, &now); - long int end = (now.tv_sec * 1000 + usectmo - + (now.tv_nsec + 500000) / 1000000); + struct __timespec64 now; + __clock_gettime64 (CLOCK_REALTIME, &now); + int64_t end = (now.tv_sec * 1000 + usectmo + + (now.tv_nsec + 500000) / 1000000); long int timeout = usectmo; while (1) { @@ -71,7 +72,7 @@ wait_on_socket (int sock, long int usectmo) break; /* Recompute the timeout time. */ - __clock_gettime (CLOCK_REALTIME, &now); + __clock_gettime64 (CLOCK_REALTIME, &now); timeout = end - ((now.tv_sec * 1000 + (now.tv_nsec + 500000) / 1000000)); } @@ -193,7 +194,7 @@ open_socket (request_type type, const char *key, size_t keylen) memcpy (reqdata->key, key, keylen); bool first_try = true; - struct timespec tvend = { 0, 0 }; + struct __timespec64 tvend = { 0, 0 }; while (1) { #ifndef MSG_NOSIGNAL @@ -212,8 +213,8 @@ open_socket (request_type type, const char *key, size_t keylen) /* The daemon is busy wait for it. */ int to; - struct timespec now; - __clock_gettime (CLOCK_REALTIME, &now); + struct __timespec64 now; + __clock_gettime64 (CLOCK_REALTIME, &now); if (first_try) { tvend.tv_nsec = now.tv_nsec;