[Intel-gfx] [PATCH 1/2] Revert "lib/drmtest: ducttape over fork race"

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Tue Dec 3 17:44:54 CET 2013


From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

This reverts commit a031a1bf93b828585e7147f06145fc5030814547.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Conflicts:
	lib/drmtest.c
---
 lib/drmtest.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 94fa686..dcacd3b 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -1127,7 +1127,6 @@ static void fork_helper_exit_handler(int sig)
 bool __igt_fork_helper(struct igt_helper_process *proc)
 {
 	pid_t pid;
-	sighandler_t oldsig;
 	int id;
 
 	assert(!proc->running);
@@ -1138,13 +1137,6 @@ bool __igt_fork_helper(struct igt_helper_process *proc)
 
 	igt_install_exit_handler(fork_helper_exit_handler);
 
-	/*
-	 * XXX: There's a race between fork and the subsequent kill in
-	 * igt_stop_signal_helper if we don't ovewrite the SIGQUIT handler. Note
-	 * that inserting sufficient amounts of printf or other delays makes
-	 * this unnecessary.
-	 */
-	oldsig = signal(SIGQUIT, SIG_DFL);
 	switch (pid = fork()) {
 	case -1:
 		igt_assert(0);
@@ -1155,8 +1147,6 @@ bool __igt_fork_helper(struct igt_helper_process *proc)
 
 		return true;
 	default:
-		signal(SIGQUIT, oldsig);
-
 		proc->running = true;
 		proc->pid = pid;
 		proc->id = id;
-- 
1.8.4.3




More information about the Intel-gfx mailing list