Module Name: src
Committed By: ad
Date: Sun Apr 19 23:05:05 UTC 2020
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
lwp_wait(): don't need to check for process exit, cv_wait_sig() does it.
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 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.233 src/sys/kern/kern_lwp.c:1.234
--- src/sys/kern/kern_lwp.c:1.233 Sat Apr 4 20:20:12 2020
+++ src/sys/kern/kern_lwp.c Sun Apr 19 23:05:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.233 2020/04/04 20:20:12 thorpej Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.234 2020/04/19 23:05:04 ad Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -211,7 +211,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.233 2020/04/04 20:20:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.234 2020/04/19 23:05:04 ad Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -740,13 +740,11 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
}
/*
- * Break out if the process is exiting, or if all LWPs are
- * in _lwp_wait(). There are other ways to hang the process
- * with _lwp_wait(), but the sleep is interruptable so
- * little point checking for them.
+ * Break out if all LWPs are in _lwp_wait(). There are
+ * other ways to hang the process with _lwp_wait(), but the
+ * sleep is interruptable so little point checking for them.
*/
- if ((p->p_sflag & PS_WEXIT) != 0 ||
- p->p_nlwpwait == p->p_nlwps) {
+ if (p->p_nlwpwait == p->p_nlwps) {
error = EDEADLK;
break;
}
