Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make When JobExec() was called from JobRestartJobs()...



details:   https://anonhg.NetBSD.org/src/rev/943e5792aa6b
branches:  trunk
changeset: 540276:943e5792aa6b
user:      gson <gson%NetBSD.org@localhost>
date:      Mon Dec 09 01:23:53 2002 +0000

description:
When JobExec() was called from JobRestartJobs() via JobRestart(), it
executed the make job with sigprocmask(SIG_BLOCK) in effect for a
number of signals including SIGCHLD.  This caused recursive submakes
of the make process in question not to receive SIGCHLDs when their
jobs exited.  This was a second, independent cause of bin/18895 in
addition to the race condition already fixed.  Fixed by unblocking all
signals before executing the job.

diffstat:

 usr.bin/make/job.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r e4cd69243381 -r 943e5792aa6b usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Dec 08 22:30:53 2002 +0000
+++ b/usr.bin/make/job.c        Mon Dec 09 01:23:53 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.74 2002/11/26 05:30:01 enami Exp $   */
+/*     $NetBSD: job.c,v 1.75 2002/12/09 01:23:53 gson Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: job.c,v 1.74 2002/11/26 05:30:01 enami Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.75 2002/12/09 01:23:53 gson Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)job.c      8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: job.c,v 1.74 2002/11/26 05:30:01 enami Exp $");
+__RCSID("$NetBSD: job.c,v 1.75 2002/12/09 01:23:53 gson Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1371,6 +1371,7 @@
        JobSigReset();
 
        /* Now unblock signals */
+       sigemptyset(&mask);
        JobSigUnlock(&mask);
 
        /*



Home | Main Index | Thread Index | Old Index