lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

y2038: Replace __clock_gettime with __clock_gettime64

Browse Source 
The __clock_gettime internal function is not supporting 64 bit time on
architectures with __WORDSIZE == 32 and __TIMESIZE != 64 (like e.g. ARM 32
bit).

The __clock_gettime64 function shall be used instead in the glibc itself as
it supports 64 bit time on those systems.
This patch does not bring any changes to systems with __WORDSIZE == 64 as
for them the __clock_gettime64 is aliased to __clock_gettime (in
./include/time.h).
This commit is contained in:
Lukasz Majewski
2020-03-16 08:31:41 +01:00
parent 5b9b177bf6
commit e9698175b0
9 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchtests/bench-timing.h
View File

@ -18,7 +18,7 @@
#undef attribute_hidden #undef attribute_hidden
#define attribute_hidden #define attribute_hidden
#define __clock_gettime clock_gettime #define __clock_gettime __clock_gettime64
#include <hp-timing.h> #include <hp-timing.h>
#include <stdint.h> #include <stdint.h>

4
include/random-bits.h
View File

@ -30,8 +30,8 @@
static inline uint32_t static inline uint32_t
random_bits (void) random_bits (void)
{ {
struct timespec tv; struct __timespec64 tv;
__clock_gettime (CLOCK_MONOTONIC, &tv); __clock_gettime64 (CLOCK_MONOTONIC, &tv);
/* Shuffle the lower bits to minimize the clock bias. */ /* Shuffle the lower bits to minimize the clock bias. */
uint32_t ret = tv.tv_nsec ^ tv.tv_sec; uint32_t ret = tv.tv_nsec ^ tv.tv_sec;
ret ^= (ret << 24) | (ret >> 8); ret ^= (ret << 24) | (ret >> 8);

4
login/logout.c
View File

@ -47,8 +47,8 @@ logout (const char *line)
memset (ut->ut_name, '\0', sizeof ut->ut_name); memset (ut->ut_name, '\0', sizeof ut->ut_name);
memset (ut->ut_host, '\0', sizeof ut->ut_host); memset (ut->ut_host, '\0', sizeof ut->ut_host);
struct timespec ts; struct __timespec64 ts;
__clock_gettime (CLOCK_REALTIME, &ts); __clock_gettime64 (CLOCK_REALTIME, &ts);
TIMESPEC_TO_TIMEVAL (&ut->ut_tv, &ts); TIMESPEC_TO_TIMEVAL (&ut->ut_tv, &ts);
ut->ut_type = DEAD_PROCESS; ut->ut_type = DEAD_PROCESS;

5
login/logwtmp.c
View File

@ -21,6 +21,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <utmp.h> #include <utmp.h>
#include <struct___timespec64.h>
void void
@ -36,8 +37,8 @@ logwtmp (const char *line, const char *name, const char *host)
strncpy (ut.ut_name, name, sizeof ut.ut_name); strncpy (ut.ut_name, name, sizeof ut.ut_name);
strncpy (ut.ut_host, host, sizeof ut.ut_host); strncpy (ut.ut_host, host, sizeof ut.ut_host);
struct timespec ts; struct __timespec64 ts;
__clock_gettime (CLOCK_REALTIME, &ts); __clock_gettime64 (CLOCK_REALTIME, &ts);
TIMESPEC_TO_TIMEVAL (&ut.ut_tv, &ts); TIMESPEC_TO_TIMEVAL (&ut.ut_tv, &ts);
updwtmp (_PATH_WTMP, &ut); updwtmp (_PATH_WTMP, &ut);

16
nis/nis_call.c
View File

@ -575,7 +575,7 @@ static struct nis_server_cache
unsigned int size; unsigned int size;
unsigned int server_used; unsigned int server_used;
unsigned int current_ep; unsigned int current_ep;
time_t expires; __time64_t expires;
char name[]; char name[];
} *nis_server_cache[16]; } *nis_server_cache[16];
static time_t nis_cold_start_mtime; static time_t nis_cold_start_mtime;
@ -584,7 +584,7 @@ __libc_lock_define_initialized (static, nis_server_cache_lock)
static directory_obj * static directory_obj *
nis_server_cache_search (const_nis_name name, int search_parent, nis_server_cache_search (const_nis_name name, int search_parent,
unsigned int *server_used, unsigned int *current_ep, unsigned int *server_used, unsigned int *current_ep,
struct timeval *now) struct __timespec64 *now)
{ {
directory_obj *ret = NULL; directory_obj *ret = NULL;
int i; int i;
@ -642,7 +642,7 @@ nis_server_cache_search (const_nis_name name, int search_parent,
static void static void
nis_server_cache_add (const_nis_name name, int search_parent, nis_server_cache_add (const_nis_name name, int search_parent,
directory_obj *dir, unsigned int server_used, directory_obj *dir, unsigned int server_used,
unsigned int current_ep, struct timeval *now) unsigned int current_ep, struct __timespec64 *now)
{ {
struct nis_server_cache **loc; struct nis_server_cache **loc;
struct nis_server_cache *new; struct nis_server_cache *new;
@ -708,8 +708,7 @@ __nisfind_server (const_nis_name name, int search_parent,
nis_error result = NIS_SUCCESS; nis_error result = NIS_SUCCESS;
nis_error status; nis_error status;
directory_obj *obj; directory_obj *obj;
struct timeval now; struct __timespec64 ts;
struct timespec ts;
unsigned int server_used = ~0; unsigned int server_used = ~0;
unsigned int current_ep = ~0; unsigned int current_ep = ~0;
@ -719,12 +718,11 @@ __nisfind_server (const_nis_name name, int search_parent,
if (*dir != NULL) if (*dir != NULL)
return NIS_SUCCESS; return NIS_SUCCESS;
__clock_gettime (CLOCK_REALTIME, &ts); __clock_gettime64 (CLOCK_REALTIME, &ts);
TIMESPEC_TO_TIMEVAL (&now, &ts);
if ((flags & NO_CACHE) == 0) if ((flags & NO_CACHE) == 0)
*dir = nis_server_cache_search (name, search_parent, &server_used, *dir = nis_server_cache_search (name, search_parent, &server_used,
&current_ep, &now); &current_ep, &ts);
if (*dir != NULL) if (*dir != NULL)
{ {
unsigned int server_len = (*dir)->do_servers.do_servers_len; unsigned int server_len = (*dir)->do_servers.do_servers_len;
@ -783,7 +781,7 @@ __nisfind_server (const_nis_name name, int search_parent,
} }
if ((flags & NO_CACHE) == 0) if ((flags & NO_CACHE) == 0)
nis_server_cache_add (name, search_parent, obj, nis_server_cache_add (name, search_parent, obj,
server_used, current_ep, &now); server_used, current_ep, &ts);
} }
else else
{ {

4
sysdeps/generic/hp-timing.h
View File

@ -34,8 +34,8 @@ typedef uint64_t hp_timing_t;
vDSO symbol. */ vDSO symbol. */
#define HP_TIMING_NOW(var) \ #define HP_TIMING_NOW(var) \
({ \ ({ \
struct timespec tv; \ struct __timespec64 tv; \
__clock_gettime (CLOCK_MONOTONIC, &tv); \ __clock_gettime64 (CLOCK_MONOTONIC, &tv); \
(var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \ (var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \
}) })

4
sysdeps/generic/memusage.h
View File

@ -28,9 +28,9 @@
#ifndef GETTIME #ifndef GETTIME
# define GETTIME(low,high) \ # define GETTIME(low,high) \
{ \ { \
struct timespec now; \ struct __timespec64 now; \
uint64_t usecs; \ uint64_t usecs; \
clock_gettime (CLOCK_REALTIME, &now); \ __clock_gettime64 (CLOCK_REALTIME, &now); \
usecs = (uint64_t)now.tv_nsec / 1000 + (uint64_t)now.tv_sec * 1000000; \ usecs = (uint64_t)now.tv_nsec / 1000 + (uint64_t)now.tv_sec * 1000000; \
low = usecs & 0xffffffff; \ low = usecs & 0xffffffff; \
high = usecs >> 32; \ high = usecs >> 32; \

4
sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c
View File

@ -35,8 +35,8 @@ __gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz)
if (__glibc_unlikely (tz != 0)) if (__glibc_unlikely (tz != 0))
memset (tz, 0, sizeof (struct timezone)); memset (tz, 0, sizeof (struct timezone));
struct timespec ts; struct __timespec64 ts;
__clock_gettime (CLOCK_REALTIME, &ts); __clock_gettime64 (CLOCK_REALTIME, &ts);
*tv32 = valid_timespec_to_timeval32 (ts); *tv32 = valid_timespec_to_timeval32 (ts);
return 0; return 0;

7
sysdeps/unix/sysv/linux/clock.c
View File

@ -23,15 +23,12 @@
clock_t clock_t
clock (void) clock (void)
{ {
struct timespec ts; struct __timespec64 ts;
_Static_assert (CLOCKS_PER_SEC == 1000000, _Static_assert (CLOCKS_PER_SEC == 1000000,
"CLOCKS_PER_SEC should be 1000000"); "CLOCKS_PER_SEC should be 1000000");
/* clock_gettime shouldn't fail here since CLOCK_PROCESS_CPUTIME_ID is if (__glibc_unlikely (__clock_gettime64 (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0))
supported since 2.6.12. Check the return value anyway in case the kernel
barfs on us for some reason. */
if (__glibc_unlikely (__clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0))
return (clock_t) -1; return (clock_t) -1;
return (ts.tv_sec * CLOCKS_PER_SEC return (ts.tv_sec * CLOCKS_PER_SEC