Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset l_mutex when waking up a thread. select uses it to determine

Browse Source 
if a thread is still selecting, and would get a KASSERT panic if
the thread had been woken up but not run yet when selnotify() was
called.
This commit is contained in:
pooka 2010-07-22 21:00:07 +00:00
parent 591b4ec0ca
commit f3c8997bfe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/rump/librump/rumpkern/sleepq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $ */ /* $NetBSD: sleepq.c,v 1.7 2010/07/22 21:00:07 pooka Exp $ */
/* /*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved. * Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@ -26,7 +26,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.7 2010/07/22 21:00:07 pooka Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/condvar.h> #include <sys/condvar.h>
@ -112,6 +112,7 @@ sleepq_wake(sleepq_t *sq, wchan_t wchan, u_int expected, kmutex_t *mp)
if (l->l_wchan == wchan) { if (l->l_wchan == wchan) {
found = true; found = true;
l->l_wchan = NULL; l->l_wchan = NULL;
l->l_mutex = NULL;
TAILQ_REMOVE(sq, l, l_sleepchain); TAILQ_REMOVE(sq, l, l_sleepchain);
} }
} }
@ -127,6 +128,7 @@ sleepq_unsleep(struct lwp *l, bool cleanup)
{ {
l->l_wchan = NULL; l->l_wchan = NULL;
l->l_mutex = NULL;
TAILQ_REMOVE(l->l_sleepq, l, l_sleepchain); TAILQ_REMOVE(l->l_sleepq, l, l_sleepchain);
cv_broadcast(&sq_cv); cv_broadcast(&sq_cv);