From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [PATCH 37/52] time: Add 64 bit time support for getdate
Date: Mon, 8 Mar 2021 22:27:05 +0100 [thread overview]
Message-ID: <20210308222705.593685bd@jawa> (raw)
In-Reply-To: <20210305201518.798584-38-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 5164 bytes --]
On Fri, 5 Mar 2021 17:15:03 -0300
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote:
> The getdate is basically a wrapper localtime and mktime. The 64 bit
> time support is done calling the 64 bit internal functions, there is
> no need to add a new symbol version.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> include/time.h | 12 ++++++++++--
> time/getdate.c | 22 ++++++++++------------
> time/tst-getdate.c | 14 ++++----------
> 3 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/include/time.h b/include/time.h
> index caf2af5e74..36754695c9 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -280,8 +280,8 @@ hidden_proto (__nanosleep64)
> #endif
>
>
> -extern int __getdate_r (const char *__string, struct tm *__resbufp)
> - attribute_hidden;
> +extern int __getdate_r (const char *__string, struct tm *__resbufp);
> +libc_hidden_proto (__getdate_r);
>
>
> /* Determine CLK_TCK value. */
> @@ -502,6 +502,14 @@ time_now (void)
> __clock_gettime (TIME_CLOCK_GETTIME_CLOCKID, &ts);
> return ts.tv_sec;
> }
> +
> +static inline __time64_t
> +time64_now (void)
> +{
> + struct __timespec64 ts;
> + __clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts);
> + return ts.tv_sec;
> +}
> #endif
>
> #endif
> diff --git a/time/getdate.c b/time/getdate.c
> index 6e2f75566b..cdcc898517 100644
> --- a/time/getdate.c
> +++ b/time/getdate.c
> @@ -112,16 +112,16 @@ __getdate_r (const char *string, struct tm *tp)
> size_t len;
> char *datemsk;
> char *result = NULL;
> - time_t timer;
> + __time64_t timer;
> struct tm tm;
> - struct stat64 st;
> - int mday_ok = 0;
> + struct __stat64_t64 st;
> + bool mday_ok = false;
>
> datemsk = getenv ("DATEMSK");
> if (datemsk == NULL || *datemsk == '\0')
> return 1;
>
> - if (__stat64 (datemsk, &st) < 0)
> + if (__stat64_time64 (datemsk, &st) < 0)
> return 3;
>
> if (!S_ISREG (st.st_mode))
> @@ -219,8 +219,8 @@ __getdate_r (const char *string, struct tm *tp)
> return 7;
>
> /* Get current time. */
> - timer = time_now ();
> - __localtime_r (&timer, &tm);
> + timer = time64_now ();
> + __localtime64_r (&timer, &tm);
>
> /* If only the weekday is given, today is assumed if the given day
> is equal to the current day and next week if it is less. */
> @@ -230,7 +230,7 @@ __getdate_r (const char *string, struct tm *tp)
> tp->tm_year = tm.tm_year;
> tp->tm_mon = tm.tm_mon;
> tp->tm_mday = tm.tm_mday + (tp->tm_wday - tm.tm_wday + 7) % 7;
> - mday_ok = 1;
> + mday_ok = true;
> }
>
> /* If only the month is given, the current month is assumed if the
> @@ -242,7 +242,7 @@ __getdate_r (const char *string, struct tm *tp)
> if (tp->tm_year == INT_MIN)
> tp->tm_year = tm.tm_year + (((tp->tm_mon - tm.tm_mon) < 0) ?
> 1 : 0); tp->tm_mday = first_wday (tp->tm_year, tp->tm_mon,
> tp->tm_wday);
> - mday_ok = 1;
> + mday_ok = true;
> }
>
> /* If no hour, minute and second are given the current hour, minute
> @@ -285,15 +285,13 @@ __getdate_r (const char *string, struct tm *tp)
> call normalizes the struct tm. */
> if ((!mday_ok && !check_mday (TM_YEAR_BASE + tp->tm_year,
> tp->tm_mon, tp->tm_mday))
> - || mktime (tp) == (time_t) -1)
> + || __mktime64 (tp) == (time_t) -1)
> return 8;
>
> return 0;
> }
> -#ifdef weak_alias
> weak_alias (__getdate_r, getdate_r)
> -#endif
> -
> +libc_hidden_def (__getdate_r)
>
> struct tm *
> getdate (const char *string)
> diff --git a/time/tst-getdate.c b/time/tst-getdate.c
> index c37ba3083a..3bb0e96707 100644
> --- a/time/tst-getdate.c
> +++ b/time/tst-getdate.c
> @@ -115,20 +115,14 @@ do_test (void)
> {
> setenv ("TZ", tests[i].tz, 1);
>
> - int expected_err;
> - if (sizeof (time_t) == 4 && tests[i].time64)
> - expected_err = 8;
> - else
> - expected_err = 0;
> -
> tm = getdate (tests[i].str);
> - TEST_COMPARE (getdate_err, expected_err);
> - if (getdate_err != expected_err)
> + TEST_COMPARE (getdate_err, 0);
> + if (getdate_err != 0)
> {
> support_record_failure ();
> printf ("%s\n", report_date_error ());
> }
> - else if (getdate_err == 0)
> + else
> {
> TEST_COMPARE (tests[i].tm.tm_mon, tm->tm_mon);
> TEST_COMPARE (tests[i].tm.tm_year, tm->tm_year);
> @@ -139,7 +133,7 @@ do_test (void)
> }
>
> struct tm tms;
> - TEST_COMPARE (getdate_r (tests[i].str, &tms), expected_err);
> + TEST_COMPARE (getdate_r (tests[i].str, &tms), 0);
> if (getdate_err == 0)
> {
> TEST_COMPARE (tests[i].tm.tm_mon, tms.tm_mon);
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-08 21:27 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 20:14 [PATCH 00/52] Add 64 bit time support on legacy ABIs Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 01/52] io: Use temporary directory and file for ftwtest-sh Adhemerval Zanella via Libc-alpha
2021-03-05 20:56 ` Andreas Schwab
2021-03-05 23:53 ` Joseph Myers
2021-03-08 13:00 ` Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 02/52] linux: Add futimes test Adhemerval Zanella via Libc-alpha
2021-03-05 20:30 ` Florian Weimer via Libc-alpha
2021-03-08 13:01 ` Adhemerval Zanella via Libc-alpha
2021-03-08 13:08 ` Florian Weimer via Libc-alpha
2021-03-08 13:26 ` Adhemerval Zanella via Libc-alpha
2021-03-08 13:30 ` Florian Weimer via Libc-alpha
2021-03-05 20:33 ` Florian Weimer via Libc-alpha
2021-03-08 13:02 ` Adhemerval Zanella via Libc-alpha
2021-03-08 13:23 ` Adhemerval Zanella via Libc-alpha
2021-03-06 0:02 ` Joseph Myers
2021-03-06 3:52 ` Paul Zimmermann
2021-03-08 13:03 ` Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 03/52] linux: Add lutimes test Adhemerval Zanella via Libc-alpha
2021-03-05 20:31 ` Florian Weimer via Libc-alpha
2021-03-06 0:02 ` Joseph Myers
2021-03-05 20:14 ` [PATCH 04/52] time: Add getitimer and setitimer basic tests Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 05/52] time: Add gmtime/gmtime_r tests Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 06/52] time: Add timegm/timelocal basic tests Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 07/52] time: Add basic timespec_get tests Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 08/52] time: Add 64 bit tests for getdate / getdate_r Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 09/52] io: Add basic tests for utimensat Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 10/52] posix: Add wait3 tests Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 11/52] linux: mips: Split libpthread.abilist in n32 and n64 Adhemerval Zanella via Libc-alpha
2021-03-05 20:39 ` Florian Weimer via Libc-alpha
2021-03-08 13:05 ` Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 12/52] linux: mips: Split librt.abilist " Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 13/52] linux: mips: Split libanl.abilist " Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 14/52] linux: s390: Add libanl.abilist in s390 and s390x Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 15/52] login: Consolidate utmp and utmpx headers Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 16/52] login: Move gnu utmpx to default implementation Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 17/52] Consolidate and simplify internal utmp definitions Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 18/52] support: Add 'touch' command Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 19/52] Add tests-container-internal rules Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 20/52] login: Add 64-bit time support to utmp/utmpx Adhemerval Zanella via Libc-alpha
2021-04-27 12:30 ` Florian Weimer via Libc-alpha
2021-04-27 13:58 ` Andreas Schwab
2021-04-27 14:18 ` Florian Weimer via Libc-alpha
2021-04-27 14:51 ` Andreas Schwab
2021-04-27 18:03 ` Joseph Myers
2021-04-30 10:03 ` Florian Weimer via Libc-alpha
2021-04-30 12:17 ` Andreas Schwab
2021-04-30 12:22 ` Florian Weimer via Libc-alpha
2021-04-30 14:11 ` Andreas Schwab
2021-03-05 20:14 ` [PATCH 21/52] linux: Add pwrite64_nocancel Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 22/52] login: Use 64-bit time on struct lastlog [BZ #25844] Adhemerval Zanella via Libc-alpha
2021-03-06 0:07 ` Joseph Myers
2021-03-08 13:05 ` Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 23/52] Remove __WORDSIZE_TIME64_COMPAT32 Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 24/52] linux: Add fallback for 64-bit time_t SO_{RCV, SND}TIMEO Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 25/52] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 26/52] linux: Add recvvmsg " Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 27/52] y2038: Add __USE_TIME_BITS64 support for time_t Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 28/52] y2038: Add __USE_TIME_BITS64 support for struct timeval Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 29/52] y2038: Add __USE_TIME_BITS64 support for struct timespec Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 30/52] y2038: Add __USE_TIME_BITS64 support for struct utimbuf Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 31/52] y2038: linux: Add __USE_TIME_BITS64 support for struct timex Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 32/52] y2038: Use a common definition for stat Adhemerval Zanella via Libc-alpha
2021-03-05 20:14 ` [PATCH 33/52] y2038: Use a common definition for msqid_ds Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 34/52] y2038: Use a common definition for semid_ds Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 35/52] y2038: Use a common definition for shmid_ds Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 36/52] y2038: Add __USE_TIME_BITS64 support for socket-constants.h Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 37/52] time: Add 64 bit time support for getdate Adhemerval Zanella via Libc-alpha
2021-03-08 21:27 ` Lukasz Majewski [this message]
2021-03-05 20:15 ` [PATCH 38/52] y2038: Add support for 64 bit time on legacy ABIs Adhemerval Zanella via Libc-alpha
2021-03-08 21:27 ` Lukasz Majewski
2021-03-05 20:15 ` [PATCH 39/52] posix: Add glob64 with 64 bit time_t support Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 40/52] io: Add fts64 " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 41/52] io: Add ftw64 " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 42/52] libsupport: Add 64 bit time_t support for time functions Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 43/52] libsupport: Add 64 bit time_t support for stat functions Adhemerval Zanella via Libc-alpha
2021-03-05 20:42 ` Florian Weimer via Libc-alpha
2021-03-08 13:06 ` Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 44/52] y2038: Add test coverage Adhemerval Zanella via Libc-alpha
2021-03-06 0:13 ` Joseph Myers
2021-03-08 13:12 ` Adhemerval Zanella via Libc-alpha
2021-03-08 21:28 ` Lukasz Majewski
2021-03-05 20:15 ` [PATCH 45/52] Use 64 bit time_t stat internally Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 46/52] debug: build pcprofiledump with LFS and 64 bit time support Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 47/52] elf: Use LFS and 64 bit time_t for installed programs Adhemerval Zanella via Libc-alpha
2021-03-05 20:43 ` Florian Weimer via Libc-alpha
2021-03-08 13:14 ` Adhemerval Zanella via Libc-alpha
2021-03-08 15:26 ` Florian Weimer via Libc-alpha
2021-03-05 20:15 ` [PATCH 48/52] iconv: " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 49/52] locale: " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 50/52] nss: " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 51/52] posix: " Adhemerval Zanella via Libc-alpha
2021-03-05 20:15 ` [PATCH 52/52] timezone: " Adhemerval Zanella via Libc-alpha
2021-03-05 23:57 ` [PATCH 00/52] Add 64 bit time support on legacy ABIs Joseph Myers
2021-03-08 13:18 ` Adhemerval Zanella via Libc-alpha
2021-03-07 10:42 ` Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308222705.593685bd@jawa \
--to=lukma@denx.de \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).