Module Name: src
Committed By: christos
Date: Sat Dec 2 22:51:22 UTC 2017
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
Also wait interruptibly when exiting. Avoids deadlocked on exit processes
create by golang.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/kern/kern_lwp.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_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.190 src/sys/kern/kern_lwp.c:1.191
--- src/sys/kern/kern_lwp.c:1.190 Thu Jun 22 05:05:09 2017
+++ src/sys/kern/kern_lwp.c Sat Dec 2 17:51:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.190 2017/06/22 09:05:09 skrll Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.191 2017/12/02 22:51:22 christos 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.190 2017/06/22 09:05:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.191 2017/12/02 22:51:22 christos Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -645,8 +645,9 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
*/
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;
}
