summaryrefslogtreecommitdiff
path: root/lib/drmtest.c
diff options
context:
space:
mode:
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>2013-12-03 16:44:54 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-03 17:57:27 +0100
commitab7cbf9737fe35cc286520379e54ae9882ab402b (patch)
tree7dfc1a8481c8e82f92026f215159aeb1ee88482d /lib/drmtest.c
parentb34322fd15488eed8b7b20538cb1d50f43b4b132 (diff)
Revert "lib/drmtest: ducttape over fork race"
This reverts commit a031a1bf93b828585e7147f06145fc5030814547. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Conflicts: lib/drmtest.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/drmtest.c')
-rw-r--r--lib/drmtest.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 765dadce..139eb82f 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -1129,7 +1129,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);
@@ -1140,13 +1139,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);
@@ -1157,8 +1149,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;