Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/kern Pull up following revision(s) (requested by chri...
details: https://anonhg.NetBSD.org/src/rev/2c2ffd416590
branches: netbsd-8
changeset: 434480:2c2ffd416590
user: snj <snj%NetBSD.org@localhost>
date: Sun Dec 10 09:35:03 2017 +0000
description:
Pull up following revision(s) (requested by christos in ticket #417):
sys/kern/kern_lwp.c: revision 1.191
Also wait interruptibly when exiting. Avoids deadlocked on exit processes
create by golang.
diffstat:
sys/kern/kern_lwp.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (30 lines):
diff -r 2e90f1180ff5 -r 2c2ffd416590 sys/kern/kern_lwp.c
--- a/sys/kern/kern_lwp.c Sun Dec 10 09:24:30 2017 +0000
+++ b/sys/kern/kern_lwp.c Sun Dec 10 09:35:03 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.189 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.189 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -645,8 +645,9 @@
*/
if (exiting) {
KASSERT(p->p_nlwps > 1);
- cv_wait(&p->p_lwpcv, p->p_lock);
- error = EAGAIN;
+ error = cv_wait_sig(&p->p_lwpcv, p->p_lock);
+ if (error == 0)
+ error = EAGAIN;
break;
}
Home |
Main Index |
Thread Index |
Old Index