Relying on sleep to always return having slept isn't safe as a signal
may have occurred. If signals are constantly incoming the program will
never reach it's termination condition. This is believed to be the
mechanism causing time outs for qht-test in Travis.
Instead we use a g_timer to determine if the duration of the test has
passed and sleep for a second at a time. This may bias benchmark
results for short runs.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
tests/atomic64-bench.c | 11 ++++++++---
tests/atomic_add-bench.c | 11 ++++++++---
tests/qht-bench.c | 11 ++++++++---
3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/tests/atomic64-bench.c b/tests/atomic64-bench.c
index 71692560ed..f087ca5bc2 100644
--- a/tests/atomic64-bench.c
+++ b/tests/atomic64-bench.c
@@ -74,18 +74,23 @@ static void *thread_func(void *arg)
static void run_test(void)
{
- unsigned int remaining;
+ GTimer *timer;
unsigned int i;
while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax();
}
+
+ timer = g_timer_new();
+
atomic_set(&test_start, true);
do {
- remaining = sleep(duration);
- } while (remaining);
+ sleep(1);
+ } while (g_timer_elapsed(timer, NULL) < duration);
atomic_set(&test_stop, true);
+ g_timer_destroy(timer);
+
for (i = 0; i < n_threads; i++) {
qemu_thread_join(&threads[i]);
}
diff --git a/tests/atomic_add-bench.c b/tests/atomic_add-bench.c
index 2f6c72f63a..5fdf901a71 100644
--- a/tests/atomic_add-bench.c
+++ b/tests/atomic_add-bench.c
@@ -76,18 +76,23 @@ static void *thread_func(void *arg)
static void run_test(void)
{
- unsigned int remaining;
+ GTimer *timer;
unsigned int i;
while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax();
}
+
+ timer = g_timer_new();
+
atomic_set(&test_start, true);
do {
- remaining = sleep(duration);
- } while (remaining);
+ sleep(1);
+ } while (g_timer_elapsed(timer, NULL) < duration);
atomic_set(&test_stop, true);
+ g_timer_destroy(timer);
+
for (i = 0; i < n_threads; i++) {
qemu_thread_join(&threads[i]);
}
diff --git a/tests/qht-bench.c b/tests/qht-bench.c
index ab4e708180..7473fcb60a 100644
--- a/tests/qht-bench.c
+++ b/tests/qht-bench.c
@@ -398,18 +398,23 @@ static void pr_stats(void)
static void run_test(void)
{
- unsigned int remaining;
+ GTimer *timer;
int i;
while (atomic_read(&n_ready_threads) != n_rw_threads + n_rz_threads) {
cpu_relax();
}
+
+ timer = g_timer_new();
+
atomic_set(&test_start, true);
do {
- remaining = sleep(duration);
- } while (remaining);
+ sleep(1);
+ } while (g_timer_elapsed(timer, NULL) < duration);
atomic_set(&test_stop, true);
+ g_timer_destroy(timer);
+
for (i = 0; i < n_rw_threads; i++) {
qemu_thread_join(&rw_threads[i]);
}
--
2.17.1
