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

Don't use cv_wait_unlock() to implement cv_wait(). Instead, implement

Browse Source 
cv_wait() fully and add missing KTRACE context switch traces.
This commit is contained in:
John Baldwin 2007-03-21 20:46:26 +00:00
parent ad3f9ab320
commit 503916a7c1
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/kern/kern_condvar.c
View File

@ -96,7 +96,16 @@ void
cv_wait(struct cv *cvp, struct mtx *mp) cv_wait(struct cv *cvp, struct mtx *mp)
{ {
WITNESS_SAVE_DECL(mp); WITNESS_SAVE_DECL(mp);
struct thread *td;
td = curthread;
#ifdef KTRACE
if (KTRPOINT(td, KTR_CSW))
ktrcsw(1, 0);
#endif
CV_ASSERT(cvp, mp, td);
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object,
"Waiting on \"%s\"", cvp->cv_description);
WITNESS_SAVE(&mp->mtx_object, mp); WITNESS_SAVE(&mp->mtx_object, mp);
if (cold || panicstr) { if (cold || panicstr) {
@ -109,7 +118,21 @@ cv_wait(struct cv *cvp, struct mtx *mp)
return; return;
} }
cv_wait_unlock(cvp, mp); sleepq_lock(cvp);
cvp->cv_waiters++;
DROP_GIANT();
mtx_unlock(mp);
sleepq_add(cvp, &mp->mtx_object, cvp->cv_description, SLEEPQ_CONDVAR,
0);
sleepq_wait(cvp);
#ifdef KTRACE
if (KTRPOINT(td, KTR_CSW))
ktrcsw(0, 0);
#endif
PICKUP_GIANT();
mtx_lock(mp); mtx_lock(mp);
WITNESS_RESTORE(&mp->mtx_object, mp); WITNESS_RESTORE(&mp->mtx_object, mp);
} }
@ -153,6 +176,10 @@ cv_wait_unlock(struct cv *cvp, struct mtx *mp)
0); 0);
sleepq_wait(cvp); sleepq_wait(cvp);
#ifdef KTRACE
if (KTRPOINT(td, KTR_CSW))
ktrcsw(0, 0);
#endif
PICKUP_GIANT(); PICKUP_GIANT();
} }