diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2003-03-04 21:03:05 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2003-03-04 21:03:05 +0000 |
| commit | 263067951a1029407b1168b41d4f5757228d22dc (patch) | |
| tree | d32954415444ccb8c42b0a457f6f0e6e15a0d64e /sys/kern/kern_condvar.c | |
| parent | 9b4982bfed075878b9cdea54bdd3c33af7c2cebc (diff) | |
| download | src-263067951a1029407b1168b41d4f5757228d22dc.tar.gz src-263067951a1029407b1168b41d4f5757228d22dc.zip | |
Replace calls to WITNESS_SLEEP() and witness_list() with equivalent calls
to WITNESS_WARN().
Notes
Notes:
svn path=/head/; revision=111883
Diffstat (limited to 'sys/kern/kern_condvar.c')
| -rw-r--r-- | sys/kern/kern_condvar.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 87c2840405cf..a95e6237d4b9 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -199,7 +199,8 @@ cv_wait(struct cv *cvp, struct mtx *mp) ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold ) { @@ -255,7 +256,8 @@ cv_wait_sig(struct cv *cvp, struct mtx *mp) ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { @@ -323,7 +325,8 @@ cv_timedwait(struct cv *cvp, struct mtx *mp, int timo) ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { @@ -401,7 +404,8 @@ cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo) ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { |