From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 99A63396B42E for ; Tue, 18 May 2021 20:56:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 99A63396B42E Received: by mail-qk1-x735.google.com with SMTP id k127so10717811qkc.6 for ; Tue, 18 May 2021 13:56:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jN3Y8YKW2nvWW0gySaG67tDIAi7uJPxLL7u3u+2+Ios=; b=p0vubgvsRJVajvFzqHYyXVCa0IlUOFRihJX6J5Iz4jTi5iZlcsz6/EQEVY2aDm/VEa e+0YKuthQj0XNX9/0gIBmshCQrqn0htif2UFjVtVqbKAQdTEjOlgUeYI4UBwh8js2s4G jlq0T0CT9By8yU20d0+ka9KfkF0ogeCBQf1XT9KQaldOvpB5hXtyWBZ5nq4z7ctiRD0u 98K4KNgAw7UOKzCeH2kSHNSNNTJsDwzEbOMIyXwKNJuHPOy7bLQAo8IMqyHTN8g9IMv1 g+H7H3mnj6RAX16t4a++3hz8fc96o34HvLovgxTX0H+mcyZoXSxztQP6Fws4Uzp5Ox3a PMfg== X-Gm-Message-State: AOAM530vGbku0y6GGy81nrU2C1Dh9/W5Gy6OPEHZPak36s2e7TcXCeep XxDEmtyl1EhtTPoctnHp3sk1x/Y1zOJy1A== X-Google-Smtp-Source: ABdhPJwGChVaPHnDkuvxhustmuOJ/8Ur3z3N8i1N7hLMk9s7JMj90SJLTN6DHXPyEjc8wwB02zuBTw== X-Received: by 2002:a37:c13:: with SMTP id 19mr7446478qkm.110.1621371404968; Tue, 18 May 2021 13:56:44 -0700 (PDT) Received: from birita.. ([177.194.37.86]) by smtp.googlemail.com with ESMTPSA id o26sm13649937qkm.4.2021.05.18.13.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 13:56:44 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 18/25] time: Add 64 bit time support for getdate Date: Tue, 18 May 2021 17:56:06 -0300 Message-Id: <20210518205613.1487824-19-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210518205613.1487824-1-adhemerval.zanella@linaro.org> References: <20210518205613.1487824-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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-List-Received-Date: Tue, 18 May 2021 20:56:47 -0000 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/sys/stat.h | 2 +- include/time.h | 12 ++++++++++-- time/getdate.c | 22 ++++++++++------------ time/tst-getdate.c | 14 ++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/sys/stat.h b/include/sys/stat.h index b4c9344628..13e777b3c7 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -46,7 +46,7 @@ hidden_proto (__lstat64) hidden_proto (__fstatat64) # endif -# if __TIMESIZE == 64 +# if __TIMESIZE == 64 || defined NO_RTLD_HIDDEN # define __stat64_time64 __stat64 # define __fstat64_time64 __fstat64 # define __lstat64_time64 __lstat64 diff --git a/include/time.h b/include/time.h index 4372bfbd96..980c6bd924 100644 --- a/include/time.h +++ b/include/time.h @@ -283,8 +283,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. */ @@ -509,6 +509,14 @@ time_now (void) 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; +} + #define NSEC_PER_SEC 1000000000L /* Nanoseconds per second. */ #define USEC_PER_SEC 1000000L /* Microseconds per second. */ #define NSEC_PER_USEC 1000L /* Nanoseconds per microsecond. */ 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); -- 2.30.2