d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always assert that the passed in lock is the same as the saved lock in the

Browse Source 
sleep queue now that the one abnormal case has been fixed.
This commit is contained in:
John Baldwin 2004-03-02 15:02:08 +00:00
parent 959c0c4122
commit efac7951fe
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/subr_sleepqueue.c
View File

@ -245,25 +245,7 @@ sleepq_add(struct sleepqueue *sq, void *wchan, struct mtx *lock,
TAILQ_INSERT_TAIL(&sq->sq_blocked, td, td_slpq);
} else {
MPASS(wchan == sq->sq_wchan);
#ifdef INVARIANTS
if (flags & SLEEPQ_CONDVAR)
MPASS(lock == sq->sq_lock);
else if (lock != sq->sq_lock) {
/*
* When msleep() abusers are fixed this should
* change back to the simple MPASS() for all
* sleep queues.
*/
printf("Mismatched locks to msleep(%p, %s):\n",
wchan, wmesg);
printf(" old %p (%s), new %p (%s)\n", sq->sq_lock,
sq->sq_lock == NULL ? "null" :
sq->sq_lock->mtx_object.lo_name, lock,
lock == NULL ? "null" :
lock->mtx_object.lo_name);
backtrace();
}
#endif
MPASS(lock == sq->sq_lock);
TAILQ_FOREACH(td1, &sq->sq_blocked, td_slpq)
if (td1->td_priority > td->td_priority)
break;