[Intel-gfx] [PATCH i-g-t] lib: Use read() for timerfd timeout detection

Chris Wilson chris at chris-wilson.co.uk
Tue Apr 14 19:05:09 UTC 2020


The poll() is proving unreliable, where our tests timeout without the
spinner being terminated. Let's try a blocking read instead!

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1676
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 lib/igt_dummyload.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c
index 99ca84ad8..a59afd45b 100644
--- a/lib/igt_dummyload.c
+++ b/lib/igt_dummyload.c
@@ -399,12 +399,13 @@ igt_spin_factory(int fd, const struct igt_spin_factory *opts)
 static void *timer_thread(void *data)
 {
 	igt_spin_t *spin = data;
-	struct pollfd pfd = {
-		.fd = spin->timerfd,
-		.events = POLLIN,
-	};
+	uint64_t overruns = 0;
+	int ret;
 
-	if (poll(&pfd, 1, -1) >= 0)
+	do {
+		ret = read(spin->timerfd, &overruns, sizeof(overruns));
+	} while (ret == -1 && errno == EINTR);
+	if (overruns)
 		igt_spin_end(spin);
 
 	return NULL;
-- 
2.26.0



More information about the Intel-gfx mailing list