From patchwork Mon Jun 1 14:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 39404 X-Patchwork-Delegate: l.majewski@majess.pl Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C821388F06B; Mon, 1 Jun 2020 14:08:21 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id D02D6388F046 for ; Mon, 1 Jun 2020 14:08:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D02D6388F046 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49bH816nXJz1qsbM; Mon, 1 Jun 2020 16:08:17 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49bH816Sdcz1qwwf; Mon, 1 Jun 2020 16:08:17 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id KWWVxVEYCGnF; Mon, 1 Jun 2020 16:08:16 +0200 (CEST) X-Auth-Info: 6D22ioJ4IzuhZJLJuvM0oi5pMniRQzYx5FIrOJJNKDk= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Mon, 1 Jun 2020 16:08:16 +0200 (CEST) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [RFC 12/12] y2038: Convert timespec_* from posix-timer.h to be Y2038 safe Date: Mon, 1 Jun 2020 16:07:40 +0200 Message-Id: <20200601140740.16371-13-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200601140740.16371-1-lukma@denx.de> References: <20200601140740.16371-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-20.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Static inline functions - timespec_compare, timespec_sum and timespec_diff - from ./sysdeps/pthread/posix-timer.h have been converted to support 64 bit time on ports with __WORDSIZE == 32 && __TIMESIZE != 64. The change was focused on using struct __timespec64. Tested with glibc/glibc-many-build --keep failed glibcs --- sysdeps/pthread/posix-timer.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sysdeps/pthread/posix-timer.h b/sysdeps/pthread/posix-timer.h index 312cf2b3bd..f6572480c9 100644 --- a/sysdeps/pthread/posix-timer.h +++ b/sysdeps/pthread/posix-timer.h @@ -115,7 +115,8 @@ timer_delref (struct timer_node *timer) /* Timespec helper routines. */ static inline int __attribute ((always_inline)) -__timespec_compare (const struct timespec *left, const struct timespec *right) +__timespec_compare (const struct __timespec64 *left, + const struct __timespec64 *right) { if (left->tv_sec < right->tv_sec) return -1; @@ -131,8 +132,8 @@ __timespec_compare (const struct timespec *left, const struct timespec *right) } static inline void -__timespec_add (struct timespec *sum, const struct timespec *left, - const struct timespec *right) +__timespec_add (struct __timespec64 *sum, const struct __timespec64 *left, + const struct __timespec64 *right) { sum->tv_sec = left->tv_sec + right->tv_sec; sum->tv_nsec = left->tv_nsec + right->tv_nsec; @@ -145,8 +146,8 @@ __timespec_add (struct timespec *sum, const struct timespec *left, } static inline void -__timespec_sub (struct timespec *diff, const struct timespec *left, - const struct timespec *right) +__timespec_sub (struct __timespec64 *diff, const struct __timespec64 *left, + const struct __timespec64 *right) { diff->tv_sec = left->tv_sec - right->tv_sec; diff->tv_nsec = left->tv_nsec - right->tv_nsec;