Revert "lib/drmtest: ducttape over fork race"
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 3 Dec 2013 16:44:54 +0000 (16:44 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 3 Dec 2013 16:57:27 +0000 (17:57 +0100)
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>
lib/drmtest.c

index 765dadc..139eb82 100644 (file)
@@ -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;