diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-09-04 08:44:48 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-09-04 11:59:17 +0100 |
| commit | 67fbe2967889484f1248d851c068e1021f2dc332 (patch) | |
| tree | e261b2c744ed9f0d129d863b6678751fe5bfc7ff /tests | |
| parent | 925fbed79fd71ff998a962f12f7a8bb18c06abd7 (diff) | |
igt/pm_rps: Wait for the load-helper to signal receipt of command
Actually wait for the load-helper to complete it switch over to the new
load by using a pipe(22) between the two.
References: https://bugs.freedesktop.org/show_bug.cgi?id=102250
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pm_rps.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/pm_rps.c b/tests/pm_rps.c index 202132b1..84e71fa8 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -181,8 +181,10 @@ enum load { }; static struct load_helper { + int link; enum load load; bool exit; + bool signal; struct igt_helper_process igt_proc; } lh; @@ -190,6 +192,7 @@ static void load_helper_signal_handler(int sig) { if (sig == SIGUSR2) { lh.load = !lh.load; + lh.signal = true; igt_debug("Switching background load to %s\n", lh.load ? "high" : "low"); } else lh.exit = true; @@ -199,6 +202,8 @@ static void load_helper_signal_handler(int sig) #define LOAD_HELPER_BO_SIZE (16*1024*1024) static void load_helper_set_load(enum load load) { + bool dummy; + igt_assert(lh.igt_proc.running); if (lh.load == load) @@ -207,11 +212,14 @@ static void load_helper_set_load(enum load load) lh.load = load; kill(lh.igt_proc.pid, SIGUSR2); - usleep(1000); /* wait for load-helper to switch */ + /* wait for load-helper to switch */ + igt_assert_eq(read(lh.link, &dummy, sizeof(dummy)), sizeof(dummy)); } static void load_helper_run(enum load load) { + int link[2]; + /* * FIXME fork helpers won't get cleaned up when started from within a * subtest, so handle the case where it sticks around a bit too long. @@ -225,6 +233,10 @@ static void load_helper_run(enum load load) lh.exit = false; lh.load = load; + lh.signal = false; + + pipe(link); + lh.link = link[1]; igt_fork_helper(&lh.igt_proc) { igt_spin_t *spin[2] = {}; @@ -249,6 +261,11 @@ static void load_helper_run(enum load load) spin[0] = spin[1]; spin[lh.load == HIGH] = __igt_spin_batch_new(drm_fd); + + if (lh.signal) { + write(lh.link, &lh.signal, sizeof(lh.signal)); + lh.signal = false; + } } handle = spin[0]->handle; @@ -274,6 +291,9 @@ static void load_helper_run(enum load load) igt_spin_batch_free(drm_fd, spin[1]); igt_spin_batch_free(drm_fd, spin[0]); } + + close(lh.link); + lh.link = link[0]; } static void load_helper_stop(void) |