From patchwork Sat Jan 25 20:38:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1229291 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-108961-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de 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=IJaWDeuG; 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 484nsz3jkyz9s1x for ; Sun, 26 Jan 2020 07:39:03 +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 :mime-version:content-transfer-encoding; q=dns; s=default; b=WPD /xebnD9tzYw4gK2atkAO1JG0lhSHU5ZRmJXucgFMffUs2/NQ3gTkJG4UiHf6xfNY f7hynTlcswXVyY/HzOKsRVtx7wO8YSrtozfG3uextf2zU56vl/4POeMzujxom/CC 8sNBUEaGZGf9UZLda+Fs6EzL8pztZl+6oR5m3Un8= 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 :mime-version:content-transfer-encoding; s=default; bh=D/wlioxyC 6OXJgxiZIUKs28P5Gw=; b=IJaWDeuGV8X6uHKSuuJYX7rHXdoeiKMYCpXISUA6m 1n6vZZEu/j3KfHCXJuTWxS6LwHnheL0PupRm6oJusPF6W9JigGiQD8jXGGvzh0ZL 8fdPBHTdkXnUo/DffwdJIfJWmwAhOdsd5Qeulsy655n2VwWooR/Ovw22nNkKTjQ+ bs= Received: (qmail 84289 invoked by alias); 25 Jan 2020 20:38:57 -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 84281 invoked by uid 89); 25 Jan 2020 20:38:57 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=HX-Languages-Length:4317 X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Lukasz Majewski Subject: [PATCH v2] y2038: linux: Provide __timespec_get64 implementation Date: Sat, 25 Jan 2020 21:38:30 +0100 Message-Id: <20200125203830.27179-1-lukma@denx.de> MIME-Version: 1.0 This patch provides new instance of Linux specific timespec_get.c file placed in ./sysdeps/unix/sysv/linux/. When compared to this file version from ./time directory, it provides __timespec_get64 explicit 64 bit function for getting 64 bit time in the struct __timespec64 (for compilation using C11 standard). Moreover, a 32 bit version - __timespec_get internally uses __timespec_get64. The __timespec_get is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion to 32 bit struct timespec. Internally the timespec_get uses __clock_gettime64. This patch is necessary for having architectures with __WORDSIZE == 32 Y2038 safe. Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test proper usage of both __timespec_get64 and __timespec_get. Reviewed-by: Adhemerval Zanella --- Changes for v2: - The conversion to support 64 bit time for timespec_get() has been moved from ./time/timespec_get.c to sysdeps/unix/sysv/linux/timespec_get.c (as suggested by Adhemerval) to avoid the need to create __clock_gettime64() method for HURD (as 64 bit time support for machines with __WORDSIZE=32 and __TIMESIZE=32 is now developed solely for Linux). --- include/time.h | 3 ++ sysdeps/unix/sysv/linux/timespec_get.c | 59 ++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/timespec_get.c diff --git a/include/time.h b/include/time.h index 558923274a..047f431a1a 100644 --- a/include/time.h +++ b/include/time.h @@ -254,6 +254,7 @@ extern double __difftime (time_t time1, time_t time0); #if __TIMESIZE == 64 # define __clock_nanosleep_time64 __clock_nanosleep # define __clock_gettime64 __clock_gettime +# define __timespec_get64 __timespec_get #else extern int __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec64 *req, @@ -261,6 +262,8 @@ extern int __clock_nanosleep_time64 (clockid_t clock_id, libc_hidden_proto (__clock_nanosleep_time64) extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp); libc_hidden_proto (__clock_gettime64) +extern int __timespec_get64 (struct __timespec64 *ts, int base); +libc_hidden_proto (__timespec_get64) #endif /* Use in the clock_* functions. Size of the field representing the diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c new file mode 100644 index 0000000000..7e634f9dac --- /dev/null +++ b/sysdeps/unix/sysv/linux/timespec_get.c @@ -0,0 +1,59 @@ +/* timespec_get -- get system time - Linux version supporting 64 bit time. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +/* Set TS to calendar time based in time base BASE. */ +int +__timespec_get64 (struct __timespec64 *ts, int base) +{ + if (base == TIME_UTC) + { + __clock_gettime64 (CLOCK_REALTIME, ts); + return base; + } + return 0; +} + +#if __TIMESIZE != 64 +libc_hidden_def (__timespec_get64) + +int +__timespec_get (struct timespec *ts, int base) +{ + int ret; + struct __timespec64 tp64; + + ret = __timespec_get64 (&tp64, base); + + if (ret == TIME_UTC) + { + if (! in_time_t_range (tp64.tv_sec)) + { + __set_errno (EOVERFLOW); + return 0; + } + + *ts = valid_timespec64_to_timespec (tp64); + } + + return ret; +} +#endif +strong_alias (__timespec_get, timespec_get);