aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-05-09 14:06:06 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-05-09 14:33:53 -0300
commit40d0816faaacfb0b67ac660807b2b6a0927a7522 (patch)
treefb6ae91df059fab50e615a941a3825a95ef97e97
parentd8e0b901a461dd854ee7a98339f0433e96a15a63 (diff)
downloadglibc-40d0816faaacfb0b67ac660807b2b6a0927a7522.tar.gz
glibc-40d0816faaacfb0b67ac660807b2b6a0927a7522.tar.xz
glibc-40d0816faaacfb0b67ac660807b2b6a0927a7522.zip
nptl: Use recent additions to libsupport in tst-sem5
Checked on x86_64-linux-gnu and i686-linux-gnu. * nptl/tst-sem5.c(do_test): Use xclock_gettime, timespec_add and TEST_TIMESPEC_NOW_OR_AFTER from libsupport. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--ChangeLog3
-rw-r--r--nptl/tst-sem5.c21
2 files changed, 8 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index eb0f0460bfb..a5b37febbd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2019-05-09 Mike Crowe <mac@mcrowe.com>
+ * nptl/tst-sem5.c (do_test): Use xclock_gettime, timespec_add and
+ TEST_TIMESPEC_NOW_OR_AFTER from libsupport.
+
* nptl/tst-cond11.c: Use libsupport.
* support/timespec.h: New file. Provide timespec helper functions
diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c
index 50ab6f932c6..396222b85f6 100644
--- a/nptl/tst-sem5.c
+++ b/nptl/tst-sem5.c
@@ -22,6 +22,8 @@
#include <unistd.h>
#include <sys/time.h>
#include <support/check.h>
+#include <support/timespec.h>
+#include <support/xtime.h>
static int
@@ -29,31 +31,18 @@ do_test (void)
{
sem_t s;
struct timespec ts;
- struct timeval tv;
TEST_COMPARE (sem_init (&s, 0, 1), 0);
TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0);
- TEST_COMPARE (gettimeofday (&tv, NULL), 0);
-
- TIMEVAL_TO_TIMESPEC (&tv, &ts);
/* We wait for half a second. */
- ts.tv_nsec += 500000000;
- if (ts.tv_nsec >= 1000000000)
- {
- ++ts.tv_sec;
- ts.tv_nsec -= 1000000000;
- }
+ xclock_gettime (CLOCK_REALTIME, &ts);
+ ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2));
errno = 0;
TEST_COMPARE (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)), -1);
TEST_COMPARE (errno, ETIMEDOUT);
-
- struct timespec ts2;
- TEST_COMPARE (clock_gettime (CLOCK_REALTIME, &ts2), 0);
-
- TEST_VERIFY (ts2.tv_sec > ts.tv_sec
- || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec > ts.tv_nsec));
+ TEST_TIMESPEC_NOW_OR_AFTER (CLOCK_REALTIME, ts);
return 0;
}