This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 2/6] time: Add a timeval with a long tv_sec and tv_usec
- From: Alistair Francis <alistair dot francis at wdc dot com>
- To: libc-alpha at sourceware dot org
- Cc: alistair23 at gmail dot com, lukma at denx dot de, Alistair Francis <alistair dot francis at wdc dot com>
- Date: Mon, 3 Feb 2020 10:31:49 -0800
- Subject: [PATCH 2/6] time: Add a timeval with a long tv_sec and tv_usec
- Ironport-sdr: 6XonrMSs/1WCGBv8ZyR20+QmI3eZKMnhRrG/4DgRqsuD6+nRxcknPxNUGTBkn8mnN5SgvSdzhm NqrLiGeAYDC4c/liAX4Sga87i5DOO3AF+D49jyHpgOLqchg8RZn4UlpGYMFZFNjqBoyZtbUSmY ZkdzbPtv0XY7ulDnMK4uY9HJc/p4gfGGKDMNXaA5koXsOJyQJMy2oIVG9JRmjEH+k6Wh3L0BX7 oVGj1fbkOsmVyqBzfOnAOoE9ZF/2tyRyh719PgOwDsmdGDig+GodaBA6rvuY8Ky8a3lVqNTkb/ L+s=
- Ironport-sdr: 1e/lJFf8NdAzjxgM6oiTiLXdngdAccSX0gwX9W1sSrqQv+hYAmbZ5cgtdRegXal5gfxCB9CCsI Luj+dBCJe9OVq0uChtnC60EJ+mIjwN0Bqbwr8rUyxPHUbUh9CY0ewQuChWm5geNnMD4Cw5NWdm bYxca23w2B1l4qiQJ328Obqf88DfGnW5MUBjVcQgOuDGHxfN7uwVt6MS79N/33plBIVFM1USiY ofdJ85rz5YupcRQVO8Vp5qBcg0nqiJWfQBr2APy5GQd8j2a0Izh6Xup5o3AeyFVwknpqxn4RXc AAM3yg+4FmBN4TuOezFfXFh7
- Ironport-sdr: QKZZ7ML5Eyajjz/LES4PfU4ffS2IJAjZMu9BB6yxYTQzK8tWpNj1OLo3SQYHU7y5vrnjc0ek7q 8h+4jzQqsJHswnaXKeOl4XYCpR0UbB9Oi9h52qoJpKScvYtSIB51AZbpexePgpLTbCiIr9HKT7 Tdt7j4ecYRysYpqwXWNy6aRUxip5QaeJ+nVPOs4nYOBZATjMPDfWAugLFLbrLuqwtxqRpcD3CN VAsvOuvP6u45jnWHMy13LjBqUzfe6zRuGUWUTrvEGVlxEax0+GvX/7J1KCy9xBcV0j0KHem1cH gXc=
- References: <20200203183153.11635-1-alistair.francis@wdc.com>
- Wdcironportexception: Internal
On y2038 safe 32-bit systems the Linux kernel expects itimerval to
use a 32-bit time_t, even though the other time_t's are 64-bit. To
address this let's add a timeval_long struct to be used internally.
---
include/time.h | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/include/time.h b/include/time.h
index d425c69ede..c2c05bb671 100644
--- a/include/time.h
+++ b/include/time.h
@@ -388,6 +388,49 @@ timespec64_to_timeval64 (const struct __timespec64 ts64)
return tv64;
}
+/* A version of 'struct timeval' with `long` time_t
+ and suseconds_t. */
+struct __timeval32
+{
+ long tv_sec; /* Seconds. */
+ long tv_usec; /* Microseconds. */
+};
+
+/* Conversion functions for converting to/from __timeval32
+. If the seconds field of a __timeval32 would
+ overflow, they write { INT32_MAX, 999999 } to the output. */
+static inline struct __timeval64
+valid_timeval32_to_timeval64 (const struct __timeval32 tv)
+{
+ return (struct __timeval64) { tv.tv_sec, tv.tv_usec };
+}
+
+static inline struct __timeval32
+valid_timeval64_to_timeval32 (const struct __timeval64 tv64)
+{
+ if (__glibc_unlikely (tv64.tv_sec > (time_t) 2147483647))
+ return (struct __timeval32) { 2147483647, 999999};
+ return (struct __timeval32) { tv64.tv_sec, tv64.tv_usec };
+}
+
+static inline struct timeval
+valid_timeval32_to_timeval (const struct __timeval32 tv)
+{
+ return (struct timeval) { tv.tv_sec, tv.tv_usec };
+}
+
+static inline struct timespec
+valid_timeval32_to_timespec (const struct __timeval32 tv)
+{
+ return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 };
+}
+
+static inline struct __timeval32
+valid_timespec_to_timeval32 (const struct timespec ts)
+{
+ return (struct __timeval32) { (time_t) ts.tv_sec, ts.tv_nsec / 1000 };
+}
+
/* Check if a value is in the valid nanoseconds range. Return true if
it is, false otherwise. */
static inline bool
--
2.25.0