diff options
| author | Lukasz Majewski <lukma@denx.de> | 2020-04-21 19:08:33 +0200 |
|---|---|---|
| committer | Lukasz Majewski <lukma@denx.de> | 2020-05-05 19:36:25 +0200 |
| commit | dbf8178fdc1cc1c884efd2f5b55703da5adfb051 (patch) | |
| tree | 0b64b3939439231dda9d302db48a0842d8e4e0b0 | |
| parent | a308615f7c067371df8bd96cb233cd0574537863 (diff) | |
| download | glibc-dbf8178fdc1cc1c884efd2f5b55703da5adfb051.tar.gz glibc-dbf8178fdc1cc1c884efd2f5b55703da5adfb051.tar.xz glibc-dbf8178fdc1cc1c884efd2f5b55703da5adfb051.zip | |
y2038: Introduce struct __timex64 - new internal glibc type
The introduced glibc's 'internal' struct __timex64 is a copy of Linux kernel's struct __kernel_timex (v5.6) introduced for properly handling data for clock_adjtime64 syscall. As the struct's __kernel_timex size is the same as for archs with __WORDSIZE == 64, proper padding and data types conversion (i.e. long to long long) had to be added for architectures with __WORDSIZE == 32 && __TIMESIZE != 64. Moreover, it stores time in struct __timeval64 rather than struct timeval, which makes it Y2038-proof. Build tests: ./src/scripts/build-many-glibcs.py glibcs Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/timex.h | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h index 319d566608..c555509c82 100644 --- a/sysdeps/unix/sysv/linux/include/sys/timex.h +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -25,5 +25,51 @@ libc_hidden_proto (__adjtimex) +# include <struct___timeval64.h> +/* Local definition of 64 bit time supporting timex struct */ +# if __TIMESIZE == 64 +# define __timex64 timex +# else + +struct __timex64 +{ + unsigned int modes; /* mode selector */ + int :32; /* pad */ + long long int offset; /* time offset (usec) */ + long long int freq; /* frequency offset (scaled ppm) */ + long long int maxerror; /* maximum error (usec) */ + long long int esterror; /* estimated error (usec) */ + int status; /* clock command/status */ + int :32; /* pad */ + long long int constant; /* pll time constant */ + long long int precision; /* clock precision (usec) (read only) */ + long long int tolerance; /* clock frequency tolerance (ppm) (ro) */ + struct __timeval64 time; /* (read only, except for ADJ_SETOFFSET) */ + long long int tick; /* (modified) usecs between clock ticks */ + long long int ppsfreq; /* pps frequency (scaled ppm) (ro) */ + long long int jitter; /* pps jitter (us) (ro) */ + int shift; /* interval duration (s) (shift) (ro) */ + int :32; /* pad */ + long long int stabil; /* pps stability (scaled ppm) (ro) */ + long long int jitcnt; /* jitter limit exceeded (ro) */ + long long int calcnt; /* calibration intervals (ro) */ + long long int errcnt; /* calibration errors (ro) */ + long long int stbcnt; /* stability limit exceeded (ro) */ + + int tai; /* TAI offset (ro) */ + + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; + int :32; +}; +# endif # endif /* _ISOMAC */ #endif /* sys/timex.h */ |