From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Florian Weimer <fweimer@redhat.com>, DJ Delorie <dj@redhat.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>,
Alistair Francis <alistair23@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
Alistair Francis <alistair.francis@wdc.com>,
GNU C Library <libc-alpha@sourceware.org>,
Carlos O'Donell <carlos@redhat.com>,
Florian Weimer <fw@deneb.enyo.de>,
Zack Weinberg <zackw@panix.com>, Lukasz Majewski <lukma@denx.de>
Subject: [PATCH] tst: Fix tst-timerfd test
Date: Sun, 28 Feb 2021 22:18:29 +0100 [thread overview]
Message-ID: <20210228211829.28680-1-lukma@denx.de> (raw)
There were following problems discovered for tst-timerfd test:
1. Do not set the struct itimerspec's it_interval tv_sec to 2 seconds.
After this change the timerfd will trigger only once (the it_value is
only set in this case).
2. The 'val1' variable (including the call to timerfd_gettime) is not
needed anymore, as it is just enough to read the struct itimierspec
after sleep. As a consequence the 'val2' has been renamed to 'val'.
3. After calling timerfd_gettime, the value of struct itimierspec time,
when timer is running, is the remaining time. In the case of this test
it would be less than 1 second.
As a result the TEST_COMPARE macro logic had to be adjusted.
---
sysdeps/unix/sysv/linux/tst-timerfd.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/tst-timerfd.c b/sysdeps/unix/sysv/linux/tst-timerfd.c
index c850f7de35..8828399119 100644
--- a/sysdeps/unix/sysv/linux/tst-timerfd.c
+++ b/sysdeps/unix/sysv/linux/tst-timerfd.c
@@ -26,8 +26,8 @@
static int
do_test (void)
{
- struct itimerspec settings = { { 2, 0 }, { 2, 0 } };
- struct itimerspec val1, val2;
+ struct itimerspec settings = { { 0, 0 }, { 2, 0 } };
+ struct itimerspec val;
int fd, ret;
fd = timerfd_create (CLOCK_REALTIME, 0);
@@ -39,26 +39,19 @@ do_test (void)
if (ret != 0)
FAIL_EXIT1 ("*** timerfd_settime failed: %m\n");
- /* Read the timer just before sleep. */
- ret = timerfd_gettime (fd, &val1);
- if (ret != 0)
- FAIL_EXIT1 ("*** timerfd_gettime failed: %m\n");
-
/* Sleep for 1 second. */
ret = usleep (1000000);
if (ret != 0)
FAIL_EXIT1 ("*** usleep failed: %m\n");
/* Read the timer just after sleep. */
- ret = timerfd_gettime (fd, &val2);
+ ret = timerfd_gettime (fd, &val);
if (ret != 0)
FAIL_EXIT1 ("*** timerfd_gettime failed: %m\n");
/* Check difference between timerfd_gettime calls. */
- struct timespec r = timespec_sub (val2.it_value, val1.it_value);
TEST_COMPARE (support_timespec_check_in_range
- ((struct timespec) { 1, 0 }, r, 1.0, 1.5), 0);
-
+ ((struct timespec) { 1, 0 }, val.it_value, 0.9, 1.0), 1);
return 0;
}
--
2.20.1
next reply other threads:[~2021-02-28 21:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 21:18 Lukasz Majewski [this message]
2021-03-02 12:18 ` Adhemerval Zanella
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=20210228211829.28680-1-lukma@denx.de \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=arnd@arndb.de \
--cc=carlos@redhat.com \
--cc=dj@redhat.com \
--cc=eggert@cs.ucla.edu \
--cc=fw@deneb.enyo.de \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=zackw@panix.com \
/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).