From patchwork Sun Jan 12 10:33:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1221707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108595-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=Ys+shtKE; dkim=pass (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=d8wB084a; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47wYCT02Snz9sP6 for ; Sun, 12 Jan 2020 21:40:36 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=UjTJWjczmUnlYy0VrVldyH0nZ23AosPT/syVnm78Uf05ge/ckhMEV vrX7VFY+QglA4nQzcQDeUkCAJmaowFEt7uNNt1aKOr2eDfh8G0G89EHz8w/d4fBM S9zgINJfQ4Lwj16iZBhqq8nzIfcr+zVQ20u4nytXRW1r3KtPPnJW8g= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=e3k6WZN3XrGBmgnt7vsguwTbQcc=; b=Ys+shtKEU4BYKvAp7eSOgumnrXoo tjuprceH/F2EtMeQ7G6OyB964Ux2R1ZV/asNFbvOCdnbX6NvrunDhj9NoNSK4enS GPncAmC3aWDIDmN5vr1lHEHvncclbOIWVb2dA9Fyfh/9eDNBJgyrq3c43Kzq24WU 1mO8uyHHiLF80OM= Received: (qmail 9022 invoked by alias); 12 Jan 2020 10:40:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 8960 invoked by uid 89); 12 Jan 2020 10:40:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: esa6.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1578825606; x=1610361606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x3wP5EGEY1w4imPJ4IMeNIBOhQLIXjRSay3JDuNPISk=; b=d8wB084accEHNUJ92ZNofSWYNtuUBNpb9M81uSkQ3mVx+wvVPnnjEi5Y +e5aelqKO3osW18UoJgWgMtaVJzXVj6qgL2a4gvTLbZ2Nt2kfalhSoMNz +QjtWqVfueXKQ4mo/v0Jq0AQD/cOzJnE/NoEVBYA4A2mBpo5qY369J8w3 ma74gaXmI1z3bbN3Ygpm3INhissDBwGlNqLN0sak15emFSNNQAxVM4q31 l8igohulyko4c2sXQ2UhrB5qBXwzgKzrZgycLzedXetfkKWAbBMZUXXLo cK+amG/AXdO8wUG8uAXQPk7qG0tIFg/PldtRy5YY9tK/HEHdxNssStKJx Q==; IronPort-SDR: EVSv4oM6xi8fbwCx36Mx9leuSkga/l72g8HKX9aGL6aH4YKTX5n8+TY76JOC249mNmTwz/dMb3 /xaGXmaD+O/fWpCmAN2uJcTce1bgcqng57qUVs9bH8NJjEjual7zaRqPC7zFLRxkBYDlkAQc9I Z20TzU921WbBm8gJvCUAwATC9Gu0m8cOhc+GFDCUm/a9u6A+qIhI5QWBSqQobM9oNHstAkcYoB 2p2UaJzAerOc8ZQescLuhr+rU1CdfRDdiKv0HuIMBM7m/RzxBP/1k6J5WExAcb43diAC8q5ozw E80= IronPort-SDR: JyROPqBuRibCdxjN2UDMx7PtIlxYdWfGyr/HFMLgWcCtYz6Q6tBX7KdrI4HswFU+TGiOgjiWMp c0bkHhTXMgAxMn6RP47vnB9kd6qkTLgcAQLdY8sX11HZn6MTRQCG1tbB/uBbCXIJxfZHWYP/Ix o9FlI2PLwno+bUXajTFjAqiepOt5c79UEjKF1pvY9pOWLxt5raveveFbF2hSHH+9ngquWtbLO3 oALKvGH5ozOYLRHAjVLsh9+lzKEU6Nq5v1S/WBpQVDyDtzerRYCW3B+E/GZIP7xIavaFYXZJiC +zlpmrpqulA5jP54Wq2WzqWr IronPort-SDR: //gRvITJop81LuLAshsyUjW6n1qumSuB1buEb6j8fpl9a8XIpj9rVg/oFQGRtTF0GCgKXkRFOI LsFKVuDPznLV+XU1s8U5CocW9XPTglnDaYrUZ1VivMYmovwA9hjPl/WvQIyK1lgw+kifVwpK1r dJBwT0gWmaelmRGWBeiKK7J702/tdH6azuNrgx6N5B0NoIT/oqvV8O1X4yOK6oH1x2gvsjUN/y eAygsiTLEPZSx1d82AvfzVVps5EjWldt6pYgMRjZhIsJiTgfxM122v/wXN8RAFIYyGy4Gmx9l9 qIg= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: arnd@arndb.de, adhemerval.zanella@linaro.org, fweimer@redhat.com, joseph@codesourcery.com, palmerdabbelt@google.com, macro@wdc.com, zongbox@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com Subject: [RFC v6 03/23] time: Add a timeval with a long tv_sec and tv_usec Date: Sun, 12 Jan 2020 02:33:38 -0800 Message-Id: <85291ec316dcd3f3a3155488a8c290298650dc77.1578824547.git.alistair.francis@wdc.com> In-Reply-To: References: MIME-Version: 1.0 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 | 29 +++++++++++++++++++++++++++++ time/bits/types/struct_timeval.h | 8 ++++++++ 2 files changed, 37 insertions(+) diff --git a/include/time.h b/include/time.h index e5e8246eac..201342d1ca 100644 --- a/include/time.h +++ b/include/time.h @@ -310,6 +310,35 @@ valid_timespec64_to_timeval (const struct __timespec64 ts64) return tv; } +/* Conversion functions for converting to/from __timeval_long +. If the seconds field of a __timeval_long would + overflow, they write { INT32_MAX, 999999 } to the output. */ +static inline struct timeval +valid_timeval_long_to_timeval64 (const struct __timeval_long tv) +{ + return (struct timeval) { tv.tv_sec, tv.tv_usec }; +} + +static inline struct __timeval_long +valid_timeval64_to_timeval_long (const struct timeval tv64) +{ + if (__glibc_unlikely (tv64.tv_sec > (time_t) 2147483647)) + return (struct __timeval_long) { 2147483647, 999999}; + return (struct __timeval_long) { tv64.tv_sec, tv64.tv_usec }; +} + +static inline struct timespec +valid_timeval_long_to_timespec (const struct __timeval_long tv) +{ + return (struct timespec) { tv.tv_sec, tv.tv_usec * 1000 }; +} + +static inline struct __timeval_long +valid_timespec_to_timeval_long (const struct timespec ts) +{ + return (struct __timeval_long) { (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 diff --git a/time/bits/types/struct_timeval.h b/time/bits/types/struct_timeval.h index 70394ce886..73697689cc 100644 --- a/time/bits/types/struct_timeval.h +++ b/time/bits/types/struct_timeval.h @@ -10,4 +10,12 @@ struct timeval __time_t tv_sec; /* Seconds. */ __suseconds_t tv_usec; /* Microseconds. */ }; + +/* A version of 'struct timeval' with `long` time_t + and suseconds_t. */ +struct __timeval_long +{ + long tv_sec; /* Seconds. */ + long tv_usec; /* Microseconds. */ +}; #endif