From patchwork Sat May 23 20:32:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 39358 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 CA3DF3851C17; Sat, 23 May 2020 20:32:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA3DF3851C17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1590265965; bh=cbEiA5rRt3/AFwA55v11QjghUcvGS2AILds0LhSn2/E=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=msOR0Xs0MXq3oe/K35JmoAbAUd/hqExwGp9G8/Y/VL2uViHt5Uyd+B1To4oTK8KaB jwR7VH3BH80xcGijXKlr3AzNUh7Tm4IO9qzOAb4S8x0tfJfKDi1O8nu3xZxUQP0SyP jASXwuAWNUyqcXE+TfK2CHdludfXF+VimZjsb52c= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by sourceware.org (Postfix) with ESMTPS id 17B12385C426 for ; Sat, 23 May 2020 20:32:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 17B12385C426 Received: by mail-il1-x144.google.com with SMTP id m6so14137225ilq.7 for ; Sat, 23 May 2020 13:32:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=cbEiA5rRt3/AFwA55v11QjghUcvGS2AILds0LhSn2/E=; b=WOBz/In9XBEthFTNiZHibZNCiEMVvwoAvgR1ZFbzNhWlY97ahpoxbHoiNOSilrHDK1 mJam54X2PsVXMe/sNq5zozcMWeaeINSVE11ZV8hLBNHw9gkKYLBLCzw/9QLL8l9mOALO HFpRo0uVXSNfsAOpR81X2GkY9AI+gfSgVNiuYupqrbXGNLfsiQpCweySx7wkIszF/aH5 nzeH8rhWWFsoXPvlm5iizZzwFOMW96nxjSvFA42caDVCmyfIYmt6W8e3A0zEE2ygIuD7 z2H0Rz5m9s0rAPFj45983vUDIi6mCgNSlo77E1OOo9MxTJvNDi6WTGZIty8TBhBz3pEe QoXA== X-Gm-Message-State: AOAM531c0kHuBHHyMSjU9pP2H+ZeJVjTu+1j6xcTISwgN3Kk3ibmHg2Z xQKjNjwTII0IFPXWR2T37nqYHU9cd5qim9EpbjY= X-Google-Smtp-Source: ABdhPJxeUDoMtr0Mx+LdpDpez8JQEZebErL1WLElqsq3xaTuO9w++UBYUOpTfoO2pNYN7nPNQ3AezE+mkJsH4Jeta2E= X-Received: by 2002:a92:9f4b:: with SMTP id u72mr19050749ili.273.1590265961502; Sat, 23 May 2020 13:32:41 -0700 (PDT) MIME-Version: 1.0 References: <20200505181605.22346-1-lukma@denx.de> <20200521122423.7d98dd96@jawa> In-Reply-To: Date: Sat, 23 May 2020 13:32:05 -0700 Message-ID: Subject: [PATCH] Fix __clock_gettime64 for sysdeps/generic/hp-timing.h To: Lukasz Majewski X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis , Joseph Myers Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Thu, May 21, 2020 at 4:11 AM H.J. Lu wrote: > > On Thu, May 21, 2020 at 3:24 AM Lukasz Majewski wrote: > > > > Hi "H.J. Lu", > > > > > On Tue, May 5, 2020 at 11:21 AM Lukasz Majewski wrote: > > > > > > > > The __clock_gettime internal function is not supporting 64 bit time > > > > on architectures with __WORDSIZE == 32 and __TIMESIZE != 64 (like > > > > e.g. ARM 32 bit). > > > > > > > > The __clock_gettime64 function shall be used instead in the glibc > > > > itself as it supports 64 bit time on those systems. > > > > This patch does not bring any changes to systems with __WORDSIZE == > > > > 64 as for them the __clock_gettime64 is aliased to __clock_gettime > > > > (in ./include/time.h). > > > > > > > > --- > > > > Changes for v3: > > > > - Fix the commit message (add missing "function" after > > > > __clock_gettime64) > > > > - Refactor __nisfind_server() function to support 64 bit time > > > > with struct timespec instead of struct timeval > > > > - Change expires to __time64_t > > > > > > > > Changes for v2: > > > > - Use only TIMESPEC_TO_TIMEVAL instead of > > > > valid_timespec64_to_timeval in logout.c and logwtmp.c as it is > > > > generic enough to also support struct __timespec64 conversion to > > > > struct timeval --- > > > > benchtests/bench-timing.h | 2 +- > > > > include/random-bits.h | 4 ++-- > > > > login/logout.c | 4 ++-- > > > > login/logwtmp.c | 5 +++-- > > > > nis/nis_call.c | 16 > > > > +++++++--------- sysdeps/generic/hp-timing.h | > > > > 4 ++-- sysdeps/generic/memusage.h | 4 ++-- > > > > sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++-- > > > > sysdeps/unix/sysv/linux/clock.c | 7 ++----- > > > > 9 files changed, 23 insertions(+), 27 deletions(-) > > > > > > > > > > Does this patch work with "make bench" when > > > sysdeps/generic/hp-timing.h is used, like on arm? I got > > > In file included from ./bench-timing.h:23, > > > from ./bench-skeleton.c:25, > > > from > > > /export/build/gnu/tools-build/glibc-gitlab/build-x86_64-linux/benchtests/bench-rint.c:45: > > > ./bench-skeleton.c: In function ‘main’: > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:82:8: note: in expansion of macro ‘TIMING_NOW’ > > > 82 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:38:3: error: implicit declaration of > > > function ‘__clock_gettime64’; did you mean ‘clock_gettime’? > > > [-Werror=implicit-function-declaration] > > > 38 | __clock_gettime64 (CLOCK_MONOTONIC, &tv); \ > > > | ^~~~~~~~~~~~~~~~~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:82:8: note: in expansion of macro ‘TIMING_NOW’ > > > 82 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:82:8: note: in expansion of macro ‘TIMING_NOW’ > > > 82 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:86:8: note: in expansion of macro ‘TIMING_NOW’ > > > 86 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:86:8: note: in expansion of macro ‘TIMING_NOW’ > > > 86 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:90:8: note: in expansion of macro ‘TIMING_NOW’ > > > 90 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:90:8: note: in expansion of macro ‘TIMING_NOW’ > > > 90 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:94:8: note: in expansion of macro ‘TIMING_NOW’ > > > 94 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:94:8: note: in expansion of macro ‘TIMING_NOW’ > > > 94 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:103:3: note: in expansion of macro ‘TIMING_NOW’ > > > 103 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:103:3: note: in expansion of macro ‘TIMING_NOW’ > > > 103 | TIMING_NOW (start); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ > > > isn’t known 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:106:3: note: in expansion of macro ‘TIMING_NOW’ > > > 106 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > ../sysdeps/generic/hp-timing.h:37:23: error: unused variable ‘tv’ > > > [-Werror=unused-variable] > > > 37 | struct __timespec64 tv; \ > > > | ^~ > > > ./bench-timing.h:35:25: note: in expansion of macro ‘HP_TIMING_NOW’ > > > 35 | #define TIMING_NOW(var) HP_TIMING_NOW (var) > > > | ^~~~~~~~~~~~~ > > > ./bench-skeleton.c:106:3: note: in expansion of macro ‘TIMING_NOW’ > > > 106 | TIMING_NOW (end); > > > | ^~~~~~~~~~ > > > cc1: all warnings being treated as errors > > > > How shall I reproduce this error? > > Apply the enclosed patch and do > > $ make USE_CLOCK_GETTIME=1 bench > > > Was it supposed to be catch with build-many-glibc.py ? > > > > No, "make bench" isn't tested by build-many-glibc.py. > Here is the patch to fix __clock_gettime64 for sysdeps/generic/hp-timing.h. OK for master? From 912f3579b3034f3b375a43eed4592f9a81301b6f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 23 May 2020 10:04:20 -0700 Subject: [PATCH] Fix __clock_gettime64 for sysdeps/generic/hp-timing.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit e9698175b0b60407db1e89bcf29437ab224bca0b Author: Lukasz Majewski Date: Mon Mar 16 08:31:41 2020 +0100 y2038: Replace __clock_gettime with __clock_gettime64 breaks benchtests with sysdeps/generic/hp-timing.h: In file included from ./bench-timing.h:23, from ./bench-skeleton.c:25, from /export/build/gnu/tools-build/glibc-gitlab/build-x86_64-linux/benchtests/bench-rint.c:45: ./bench-skeleton.c: In function ‘main’: ../sysdeps/generic/hp-timing.h:37:23: error: storage size of ‘tv’ isn’t known 37 | struct __timespec64 tv; \ | ^~ We should always provide __clock_gettime64 for sysdeps/generic/hp-timing.h. Don't define __clock_gettime in benchtests/bench-timing.h since it is no longer needed. --- benchtests/bench-timing.h | 1 - include/time.h | 12 +++++++++--- sysdeps/generic/hp-timing.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h index a0d6f82465..d0176fb76e 100644 --- a/benchtests/bench-timing.h +++ b/benchtests/bench-timing.h @@ -18,7 +18,6 @@ #undef attribute_hidden #define attribute_hidden -#define __clock_gettime __clock_gettime64 #include #include diff --git a/include/time.h b/include/time.h index fe4da9ca10..246683a1c5 100644 --- a/include/time.h +++ b/include/time.h @@ -1,6 +1,15 @@ #ifndef _TIME_H #include