Skip to content

Commit

Permalink
tests: use g_usleep instead of rem = sleep(time)
Browse files Browse the repository at this point in the history
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 its termination condition. This is believed to be the
mechanism causing time outs for qht-test in Travis.

The glib g_usleep() deals with all of this for us so lets use it instead.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
stsquad committed Jan 14, 2019
1 parent d406015 commit eb4f8e1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
6 changes: 2 additions & 4 deletions tests/atomic64-bench.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,14 @@ static void *thread_func(void *arg)

static void run_test(void)
{
unsigned int remaining;
unsigned int i;

while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax();
}

atomic_set(&test_start, true);
do {
remaining = sleep(duration);
} while (remaining);
g_usleep(duration * G_USEC_PER_SEC);
atomic_set(&test_stop, true);

for (i = 0; i < n_threads; i++) {
Expand Down
6 changes: 2 additions & 4 deletions tests/atomic_add-bench.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,14 @@ static void *thread_func(void *arg)

static void run_test(void)
{
unsigned int remaining;
unsigned int i;

while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax();
}

atomic_set(&test_start, true);
do {
remaining = sleep(duration);
} while (remaining);
g_usleep(duration * G_USEC_PER_SEC);
atomic_set(&test_stop, true);

for (i = 0; i < n_threads; i++) {
Expand Down
6 changes: 2 additions & 4 deletions tests/qht-bench.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,16 +398,14 @@ static void pr_stats(void)

static void run_test(void)
{
unsigned int remaining;
int i;

while (atomic_read(&n_ready_threads) != n_rw_threads + n_rz_threads) {
cpu_relax();
}

atomic_set(&test_start, true);
do {
remaining = sleep(duration);
} while (remaining);
g_usleep(duration * G_USEC_PER_SEC);
atomic_set(&test_stop, true);

for (i = 0; i < n_rw_threads; i++) {
Expand Down

0 comments on commit eb4f8e1

Please sign in to comment.