mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 19:53:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tst: Fix tst-timerfd test

Browse Source 
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 itimerspec
after sleep. As a consequence the 'val2' has been renamed to 'val'.

3. After calling timerfd_gettime, the value of struct itimerspec 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.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Lukasz Majewski 2021-02-28 17:28:48 +01:00
parent f01a61e138
commit dd1776e327
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sysdeps/unix/sysv/linux/tst-timerfd.c
View File

@ -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;
}