From: Stafford Horne <shorne@gmail.com>
To: GLIBC patches <libc-alpha@sourceware.org>
Cc: Stafford Horne <shorne@gmail.com>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Joseph Myers <joseph@codesourcery.com>
Subject: [PATCH v2] time: Fix compile error in itimer test affecting hurd
Date: Fri, 20 Aug 2021 06:28:00 +0900 [thread overview]
Message-ID: <20210819212800.455725-1-shorne@gmail.com> (raw)
The recent change to use __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 to avoid
doing 64-bit checks on some platforms broke the test for hurd where
__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 is not defined. With error:
tst-itimer.c: In function 'do_test':
tst-itimer.c:103:11: error: '__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64' undeclared (first use in this function)
103 | if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tst-itimer.c:103:11: note: each undeclared identifier is reported only once for each function it appears in
Define a support helper to detect when setitimer and getitimer support
64-bit time_t.
Fixes commit 6e8a0aac2f ("time: Fix overflow itimer tests on 32-bit
systems").
Cc: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Joseph Myers <joseph@codesourcery.com>
---
Changes since v1:
- Move macro to support helper function.
support/support.h | 12 ++++++++++++
time/tst-itimer.c | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/support/support.h b/support/support.h
index db264e3db7..7daa2c48c9 100644
--- a/support/support.h
+++ b/support/support.h
@@ -141,6 +141,18 @@ static __inline bool support_path_support_time64 (const char *path)
0x80000002ULL);
}
+/* Return true if the setitimer and getitimer syscalls support 64-bit time_t
+ values without resulting in overflow. This is not true on some linux systems
+ which have 64-bit time_t due to legacy kernel API's. */
+static __inline bool support_itimer_support_time64 (void)
+{
+#ifdef __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64
+ return __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64;
+#else
+ return (sizeof (__time_t) == 8);
+#endif
+}
+
/* Return true if stat supports nanoseconds resolution. */
extern bool support_stat_nanoseconds (const char *path);
diff --git a/time/tst-itimer.c b/time/tst-itimer.c
index bd7d7afe83..c6d623cb19 100644
--- a/time/tst-itimer.c
+++ b/time/tst-itimer.c
@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <support/check.h>
+#include <support/support.h>
#include <support/xsignal.h>
#include <unistd.h>
#include <time.h>
@@ -100,7 +101,7 @@ do_test (void)
/* Linux does not provide 64 bit time_t support for getitimer and
setitimer on architectures with 32 bit time_t support. */
- if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
+ if (support_itimer_support_time64())
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 },
@@ -131,7 +132,7 @@ do_test (void)
it.it_interval.tv_usec = 20;
it.it_value.tv_sec = 30;
it.it_value.tv_usec = 40;
- if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64)
+ if (support_itimer_support_time64())
{
TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);
--
2.31.1
next reply other threads:[~2021-08-19 21:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 21:28 Stafford Horne [this message]
2021-09-06 21:19 ` Stafford Horne
2021-09-07 7:24 ` Florian Weimer
2021-09-07 21:20 ` Stafford Horne
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819212800.455725-1-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=joseph@codesourcery.com \
--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).