Module Name: src
Committed By: christos
Date: Sat Sep 3 10:28:33 UTC 2011
Modified Files:
src/sys/kern: kern_sleepq.c
Log Message:
We need to process SA_STOP signals immediately, and not deliver them to
the process. Instead of re-structuring the code to do that, call issignal()
like before in that case. (tail -F /file^Zfg should not get interrupted).
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_sleepq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.42 src/sys/kern/kern_sleepq.c:1.43
--- src/sys/kern/kern_sleepq.c:1.42 Wed Aug 31 12:09:55 2011
+++ src/sys/kern/kern_sleepq.c Sat Sep 3 06:28:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.42 2011/08/31 16:09:55 christos Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.43 2011/09/03 10:28:33 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.42 2011/08/31 16:09:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.43 2011/09/03 10:28:33 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -284,7 +284,9 @@
* not recurse again.
*/
mutex_enter(p->p_lock);
- if ((sig = sigispending(l, 0)) != 0)
+ if (((sig = sigispending(l, 0)) != 0 &&
+ (sigprop[sig] & SA_STOP) == 0) ||
+ (sig = issignal(l)) != 0)
error = sleepq_sigtoerror(l, sig);
mutex_exit(p->p_lock);
}