From patchwork Tue Dec 3 16:44:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 3277861 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5A83B9F3A0 for ; Tue, 3 Dec 2013 16:45:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 475F3203EB for ; Tue, 3 Dec 2013 16:45:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 01FB82015E for ; Tue, 3 Dec 2013 16:45:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82238FB48E; Tue, 3 Dec 2013 08:45:26 -0800 (PST) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 30E02FB48E for ; Tue, 3 Dec 2013 08:45:23 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 03 Dec 2013 08:41:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,818,1378882800"; d="scan'208";a="446113233" Received: from tursulin-linux.isw.intel.com ([10.102.226.168]) by orsmga002.jf.intel.com with ESMTP; 03 Dec 2013 08:45:16 -0800 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 3 Dec 2013 16:44:54 +0000 Message-Id: <1386089095-9966-2-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386089095-9966-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1386089095-9966-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 1/2] Revert "lib/drmtest: ducttape over fork race" X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin This reverts commit a031a1bf93b828585e7147f06145fc5030814547. Signed-off-by: Tvrtko Ursulin 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;