OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: use g_usleep instead of rem = sleep(time)

Browse Source 
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>
This commit is contained in:
Alex Bennée 2019-01-11 13:50:02 +00:00
parent d406015b6a
commit eb4f8e100f
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/atomic64-bench.c
View File

@ -74,16 +74,14 @@ static void *thread_func(void *arg)
static void run_test(void) static void run_test(void)
{ {
unsigned int remaining;
unsigned int i; unsigned int i;
while (atomic_read(&n_ready_threads) != n_threads) { while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax(); cpu_relax();
} }
atomic_set(&test_start, true); atomic_set(&test_start, true);
do { g_usleep(duration * G_USEC_PER_SEC);
remaining = sleep(duration);
} while (remaining);
atomic_set(&test_stop, true); atomic_set(&test_stop, true);
for (i = 0; i < n_threads; i++) { for (i = 0; i < n_threads; i++) {

6
tests/atomic_add-bench.c
View File

@ -76,16 +76,14 @@ static void *thread_func(void *arg)
static void run_test(void) static void run_test(void)
{ {
unsigned int remaining;
unsigned int i; unsigned int i;
while (atomic_read(&n_ready_threads) != n_threads) { while (atomic_read(&n_ready_threads) != n_threads) {
cpu_relax(); cpu_relax();
} }
atomic_set(&test_start, true); atomic_set(&test_start, true);
do { g_usleep(duration * G_USEC_PER_SEC);
remaining = sleep(duration);
} while (remaining);
atomic_set(&test_stop, true); atomic_set(&test_stop, true);
for (i = 0; i < n_threads; i++) { for (i = 0; i < n_threads; i++) {

6
tests/qht-bench.c
View File

@ -398,16 +398,14 @@ static void pr_stats(void)
static void run_test(void) static void run_test(void)
{ {
unsigned int remaining;
int i; int i;
while (atomic_read(&n_ready_threads) != n_rw_threads + n_rz_threads) { while (atomic_read(&n_ready_threads) != n_rw_threads + n_rz_threads) {
cpu_relax(); cpu_relax();
} }
atomic_set(&test_start, true); atomic_set(&test_start, true);
do { g_usleep(duration * G_USEC_PER_SEC);
remaining = sleep(duration);
} while (remaining);
atomic_set(&test_stop, true); atomic_set(&test_stop, true);
for (i = 0; i < n_rw_threads; i++) { for (i = 0; i < n_rw_threads; i++) {