From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id C06AA3896815 for ; Thu, 30 Apr 2020 21:03:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C06AA3896815 Received: by mail-qt1-x841.google.com with SMTP id i68so6344474qtb.5 for ; Thu, 30 Apr 2020 14:03:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:autocrypt:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=H0WKeGcTdk7XBLEoov/ybuM4rbhtzGtWJSaE9WGSams=; b=Kd26OC8N3L6fp8zqESq0vven8CINAdDbIN7ACQe1/ofvR3XByhvKgPFFb6dzNgimdg fuzZR08P5zHniQo2uzGDfYAAyTnSfvGM5R7LUZiZB5t3xzOzdwm1y0ryd+JPRU/mu8Yf KKYqz1w294qVSxBRKaBDViEezL8dxk11XRrcAEJ3JRLniIv5ul1SRlMy5H6TLJyGOxcj EcR9uNBj1Y5iNc72rEZjTT2/denQ7PHjmak4TZXVHNHvEEPs//a/mccNCDEdd6YS+VTd j4qfOHa+Pyr8JTDzNQUgyCrtW0crVXbEG4lHCkFKScsiVkSqiomlntRdwR0bBcM4a4Qv Dc/w== X-Gm-Message-State: AGi0PuZ+xGISJ8uuwXr0IxxymuNPWuaDufJQAHJx44RbWFnOrpU337RR RLT7+hUbCF0gYus2jWl9tfo9sqCvMUMSCQ== X-Google-Smtp-Source: APiQypKl0qlU4YEg+Yq85eq6q3wDDaDpwB5kqrJl1NCLrs4YdMaCMs9/InUE7R93o+lG767lNjmwrg== X-Received: by 2002:ac8:2a76:: with SMTP id l51mr438603qtl.81.1588280627220; Thu, 30 Apr 2020 14:03:47 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j76sm1035397qke.114.2020.04.30.14.03.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Apr 2020 14:03:46 -0700 (PDT) To: Lukasz Majewski , Joseph Myers Cc: Alistair Francis , Alistair Francis , GNU C Library , Florian Weimer , Andreas Schwab References: <20200326080641.10193-1-lukma@denx.de> <20200326080641.10193-6-lukma@denx.de> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= mQINBFcVGkoBEADiQU2x/cBBmAVf5C2d1xgz6zCnlCefbqaflUBw4hB/bEME40QsrVzWZ5Nq 8kxkEczZzAOKkkvv4pRVLlLn/zDtFXhlcvQRJ3yFMGqzBjofucOrmdYkOGo0uCaoJKPT186L NWp53SACXguFJpnw4ODI64ziInzXQs/rUJqrFoVIlrPDmNv/LUv1OVPKz20ETjgfpg8MNwG6 iMizMefCl+RbtXbIEZ3TE/IaDT/jcOirjv96lBKrc/pAL0h/O71Kwbbp43fimW80GhjiaN2y WGByepnkAVP7FyNarhdDpJhoDmUk9yfwNuIuESaCQtfd3vgKKuo6grcKZ8bHy7IXX1XJj2X/ BgRVhVgMHAnDPFIkXtP+SiarkUaLjGzCz7XkUn4XAGDskBNfbizFqYUQCaL2FdbW3DeZqNIa nSzKAZK7Dm9+0VVSRZXP89w71Y7JUV56xL/PlOE+YKKFdEw+gQjQi0e+DZILAtFjJLoCrkEX w4LluMhYX/X8XP6/C3xW0yOZhvHYyn72sV4yJ1uyc/qz3OY32CRy+bwPzAMAkhdwcORA3JPb kPTlimhQqVgvca8m+MQ/JFZ6D+K7QPyvEv7bQ7M+IzFmTkOCwCJ3xqOD6GjX3aphk8Sr0dq3 4Awlf5xFDAG8dn8Uuutb7naGBd/fEv6t8dfkNyzj6yvc4jpVxwARAQABtElBZGhlbWVydmFs IFphbmVsbGEgTmV0dG8gKExpbmFybyBWUE4gS2V5KSA8YWRoZW1lcnZhbC56YW5lbGxhQGxp bmFyby5vcmc+iQI3BBMBCAAhBQJXFRpKAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ EKqx7BSnlIjv0e8P/1YOYoNkvJ+AJcNUaM5a2SA9oAKjSJ/M/EN4Id5Ow41ZJS4lUA0apSXW NjQg3VeVc2RiHab2LIB4MxdJhaWTuzfLkYnBeoy4u6njYcaoSwf3g9dSsvsl3mhtuzm6aXFH /Qsauav77enJh99tI4T+58rp0EuLhDsQbnBic/ukYNv7sQV8dy9KxA54yLnYUFqH6pfH8Lly sTVAMyi5Fg5O5/hVV+Z0Kpr+ZocC1YFJkTsNLAW5EIYSP9ftniqaVsim7MNmodv/zqK0IyDB GLLH1kjhvb5+6ySGlWbMTomt/or/uvMgulz0bRS+LUyOmlfXDdT+t38VPKBBVwFMarNuREU2 69M3a3jdTfScboDd2ck1u7l+QbaGoHZQ8ZNUrzgObltjohiIsazqkgYDQzXIMrD9H19E+8fw kCNUlXxjEgH/Kg8DlpoYJXSJCX0fjMWfXywL6ZXc2xyG/hbl5hvsLNmqDpLpc1CfKcA0BkK+ k8R57fr91mTCppSwwKJYO9T+8J+o4ho/CJnK/jBy1pWKMYJPvvrpdBCWq3MfzVpXYdahRKHI ypk8m4QlRlbOXWJ3TDd/SKNfSSrWgwRSg7XCjSlR7PNzNFXTULLB34sZhjrN6Q8NQZsZnMNs TX8nlGOVrKolnQPjKCLwCyu8PhllU8OwbSMKskcD1PSkG6h3r0AquQINBFcVGkoBEACgAdbR Ck+fsfOVwT8zowMiL3l9a2DP3Eeak23ifdZG+8Avb/SImpv0UMSbRfnw/N81IWwlbjkjbGTu oT37iZHLRwYUFmA8fZX0wNDNKQUUTjN6XalJmvhdz9l71H3WnE0wneEM5ahu5V1L1utUWTyh VUwzX1lwJeV3vyrNgI1kYOaeuNVvq7npNR6t6XxEpqPsNc6O77I12XELic2+36YibyqlTJIQ V1SZEbIy26AbC2zH9WqaKyGyQnr/IPbTJ2Lv0dM3RaXoVf+CeK7gB2B+w1hZummD21c1Laua +VIMPCUQ+EM8W9EtX+0iJXxI+wsztLT6vltQcm+5Q7tY+HFUucizJkAOAz98YFucwKefbkTp eKvCfCwiM1bGatZEFFKIlvJ2QNMQNiUrqJBlW9nZp/k7pbG3oStOjvawD9ZbP9e0fnlWJIsj 6c7pX354Yi7kxIk/6gREidHLLqEb/otuwt1aoMPg97iUgDV5mlNef77lWE8vxmlY0FBWIXuZ yv0XYxf1WF6dRizwFFbxvUZzIJp3spAao7jLsQj1DbD2s5+S1BW09A0mI/1DjB6EhNN+4bDB SJCOv/ReK3tFJXuj/HbyDrOdoMt8aIFbe7YFLEExHpSk+HgN05Lg5TyTro8oW7TSMTk+8a5M kzaH4UGXTTBDP/g5cfL3RFPl79ubXwARAQABiQIfBBgBCAAJBQJXFRpKAhsMAAoJEKqx7BSn lIjvI/8P/jg0jl4Tbvg3B5kT6PxJOXHYu9OoyaHLcay6Cd+ZrOd1VQQCbOcgLFbf4Yr+rE9l mYsY67AUgq2QKmVVbn9pjvGsEaz8UmfDnz5epUhDxC6yRRvY4hreMXZhPZ1pbMa6A0a/WOSt AgFj5V6Z4dXGTM/lNManr0HjXxbUYv2WfbNt3/07Db9T+GZkpUotC6iknsTA4rJi6u2ls0W9 1UIvW4o01vb4nZRCj4rni0g6eWoQCGoVDk/xFfy7ZliR5B+3Z3EWRJcQskip/QAHjbLa3pml xAZ484fVxgeESOoaeC9TiBIp0NfH8akWOI0HpBCiBD5xaCTvR7ujUWMvhsX2n881r/hNlR9g fcE6q00qHSPAEgGr1bnFv74/1vbKtjeXLCcRKk3Ulw0bY1OoDxWQr86T2fZGJ/HIZuVVBf3+ gaYJF92GXFynHnea14nFFuFgOni0Mi1zDxYH/8yGGBXvo14KWd8JOW0NJPaCDFJkdS5hu0VY 7vJwKcyHJGxsCLU+Et0mryX8qZwqibJIzu7kUJQdQDljbRPDFd/xmGUFCQiQAncSilYOcxNU EMVCXPAQTteqkvA+gNqSaK1NM9tY0eQ4iJpo+aoX8HAcn4sZzt2pfUB9vQMTBJ2d4+m/qO6+ cFTAceXmIoFsN8+gFN3i8Is3u12u8xGudcBPvpoy4OoG Subject: Re: [PATCH v2 5/5] y2038: Replace __clock_gettime with __clock_gettime64 Message-ID: Date: Thu, 30 Apr 2020 18:03:43 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200326080641.10193-6-lukma@denx.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-24.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, 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-List-Received-Date: Thu, 30 Apr 2020 21:03:49 -0000 On 26/03/2020 05:06, 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 shall be used instead in the glibc itself as it > supports 64 bit time on those systems. > This change does not bring any change to systems with __WORDSIZE == 64 as > for them the __clock_gettime64 is aliased to __clock_gettime > (in ./include/time.h). > > --- > 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 | 6 +++--- > 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, 19 insertions(+), 21 deletions(-) > > diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h > index 5b9a8384bb..a0d6f82465 100644 > --- a/benchtests/bench-timing.h > +++ b/benchtests/bench-timing.h > @@ -18,7 +18,7 @@ > > #undef attribute_hidden > #define attribute_hidden > -#define __clock_gettime clock_gettime > +#define __clock_gettime __clock_gettime64 > #include > #include > Ok, although we might revise it later and build the benchmarks with __TIMESIZE==64. > diff --git a/include/random-bits.h b/include/random-bits.h > index fd3fa01f9b..7561e55ca6 100644 > --- a/include/random-bits.h > +++ b/include/random-bits.h > @@ -30,8 +30,8 @@ > static inline uint32_t > random_bits (void) > { > - struct timespec tv; > - __clock_gettime (CLOCK_MONOTONIC, &tv); > + struct __timespec64 tv; > + __clock_gettime64 (CLOCK_MONOTONIC, &tv); > /* Shuffle the lower bits to minimize the clock bias. */ > uint32_t ret = tv.tv_nsec ^ tv.tv_sec; > ret ^= (ret << 24) | (ret >> 8); Ok. > diff --git a/login/logout.c b/login/logout.c > index 7653fe8886..091312eb1d 100644 > --- a/login/logout.c > +++ b/login/logout.c > @@ -47,8 +47,8 @@ logout (const char *line) > memset (ut->ut_name, '\0', sizeof ut->ut_name); > memset (ut->ut_host, '\0', sizeof ut->ut_host); > > - struct timespec ts; > - __clock_gettime (CLOCK_REALTIME, &ts); > + struct __timespec64 ts; > + __clock_gettime64 (CLOCK_REALTIME, &ts); > TIMESPEC_TO_TIMEVAL (&ut->ut_tv, &ts); > ut->ut_type = DEAD_PROCESS; > Ok. > diff --git a/login/logwtmp.c b/login/logwtmp.c > index 90406acc3d..050219c153 100644 > --- a/login/logwtmp.c > +++ b/login/logwtmp.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > > > void > @@ -36,8 +37,8 @@ logwtmp (const char *line, const char *name, const char *host) > strncpy (ut.ut_name, name, sizeof ut.ut_name); > strncpy (ut.ut_host, host, sizeof ut.ut_host); > > - struct timespec ts; > - __clock_gettime (CLOCK_REALTIME, &ts); > + struct __timespec64 ts; > + __clock_gettime64 (CLOCK_REALTIME, &ts); > TIMESPEC_TO_TIMEVAL (&ut.ut_tv, &ts); > > updwtmp (_PATH_WTMP, &ut); Ok. > diff --git a/nis/nis_call.c b/nis/nis_call.c > index 92c70e97aa..9c6f62a753 100644 > --- a/nis/nis_call.c > +++ b/nis/nis_call.c > @@ -709,7 +709,7 @@ __nisfind_server (const_nis_name name, int search_parent, > nis_error status; > directory_obj *obj; > struct timeval now; > - struct timespec ts; > + struct __timespec64 ts; > unsigned int server_used = ~0; > unsigned int current_ep = ~0; > > @@ -719,8 +719,8 @@ __nisfind_server (const_nis_name name, int search_parent, > if (*dir != NULL) > return NIS_SUCCESS; > > - __clock_gettime (CLOCK_REALTIME, &ts); > - TIMESPEC_TO_TIMEVAL (&now, &ts); > + __clock_gettime64 (CLOCK_REALTIME, &ts); > + now = valid_timespec64_to_timeval (ts); > > if ((flags & NO_CACHE) == 0) > *dir = nis_server_cache_search (name, search_parent, &server_used, I think it would be simpler to just remove the timeval argument on nis_server_cache_search and move the __clock_gettime64 call on the function start. Also, it would require to change nis_server_cache to use a __time64_t for 'expires', otherwise this change won't help in case of a time_t overflow. > diff --git a/sysdeps/generic/hp-timing.h b/sysdeps/generic/hp-timing.h > index e2d7447212..af9d92f7f7 100644 > --- a/sysdeps/generic/hp-timing.h > +++ b/sysdeps/generic/hp-timing.h > @@ -34,8 +34,8 @@ typedef uint64_t hp_timing_t; > vDSO symbol. */ > #define HP_TIMING_NOW(var) \ > ({ \ > - struct timespec tv; \ > - __clock_gettime (CLOCK_MONOTONIC, &tv); \ > + struct __timespec64 tv; \ > + __clock_gettime64 (CLOCK_MONOTONIC, &tv); \ > (var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \ > }) > Ok. > diff --git a/sysdeps/generic/memusage.h b/sysdeps/generic/memusage.h > index a111864b0b..91e56d24de 100644 > --- a/sysdeps/generic/memusage.h > +++ b/sysdeps/generic/memusage.h > @@ -28,9 +28,9 @@ > #ifndef GETTIME > # define GETTIME(low,high) \ > { \ > - struct timespec now; \ > + struct __timespec64 now; \ > uint64_t usecs; \ > - clock_gettime (CLOCK_REALTIME, &now); \ > + __clock_gettime64 (CLOCK_REALTIME, &now); \ > usecs = (uint64_t)now.tv_nsec / 1000 + (uint64_t)now.tv_sec * 1000000; \ > low = usecs & 0xffffffff; \ > high = usecs >> 32; \ Is is the requirement to export __clock_gettime64 as a GLIBC_PRIVATE symbol? In any case, I think we should try to avoid use internal symbols even for distributed glibc libraries, so I think this change should go once we start to export the clock_gettime64 as default symbol. > diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c > index 8cf5d303f9..5075ae0444 100644 > --- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c > +++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c > @@ -35,8 +35,8 @@ __gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz) > if (__glibc_unlikely (tz != 0)) > memset (tz, 0, sizeof (struct timezone)); > > - struct timespec ts; > - __clock_gettime (CLOCK_REALTIME, &ts); > + struct __timespec64 ts; > + __clock_gettime64 (CLOCK_REALTIME, &ts); > > *tv32 = valid_timespec_to_timeval32 (ts); > return 0; Ok. > diff --git a/sysdeps/unix/sysv/linux/clock.c b/sysdeps/unix/sysv/linux/clock.c > index 24a8df0cf5..157ae8eb3f 100644 > --- a/sysdeps/unix/sysv/linux/clock.c > +++ b/sysdeps/unix/sysv/linux/clock.c > @@ -23,15 +23,12 @@ > clock_t > clock (void) > { > - struct timespec ts; > + struct __timespec64 ts; > > _Static_assert (CLOCKS_PER_SEC == 1000000, > "CLOCKS_PER_SEC should be 1000000"); > > - /* clock_gettime shouldn't fail here since CLOCK_PROCESS_CPUTIME_ID is > - supported since 2.6.12. Check the return value anyway in case the kernel > - barfs on us for some reason. */ > - if (__glibc_unlikely (__clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0)) > + if (__glibc_unlikely (__clock_gettime64 (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0)) > return (clock_t) -1; > > return (ts.tv_sec * CLOCKS_PER_SEC > Ok.