Date: Thu, 22 Mar 2007 02:53:03 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 116308 for review Message-ID: <200703220253.l2M2r381095742@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=116308 Change 116308 by jhb@jhb_mutex on 2007/03/22 02:52:38 IFC @116307. Affected files ... .. //depot/projects/smpng/sys/kern/kern_condvar.c#47 integrate .. //depot/projects/smpng/sys/sys/condvar.h#10 integrate .. //depot/projects/smpng/sys/sys/lock.h#45 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_condvar.c#47 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.59 2007/03/21 21:20:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.60 2007/03/21 22:22:12 jhb Exp $"); #include "opt_ktrace.h" @@ -49,12 +49,11 @@ /* * Common sanity checks for cv_wait* functions. */ -#define CV_ASSERT(cvp, mp, td) do { \ +#define CV_ASSERT(cvp, lock, td) do { \ KASSERT((td) != NULL, ("%s: curthread NULL", __func__)); \ KASSERT(TD_IS_RUNNING(td), ("%s: not TDS_RUNNING", __func__)); \ KASSERT((cvp) != NULL, ("%s: cvp NULL", __func__)); \ - KASSERT((mp) != NULL, ("%s: mp NULL", __func__)); \ - mtx_assert((mp), MA_OWNED | MA_NOTRECURSED); \ + KASSERT((lock) != NULL, ("%s: lock NULL", __func__)); \ } while (0) /* @@ -93,20 +92,23 @@ * held when cv_signal or cv_broadcast are called. */ void -cv_wait(struct cv *cvp, struct mtx *mp) +_cv_wait(struct cv *cvp, struct lock_object *lock) { - WITNESS_SAVE_DECL(mp); + WITNESS_SAVE_DECL(lock_witness); + struct lock_class *class; struct thread *td; + int lock_state; 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->lock_object, + CV_ASSERT(cvp, lock, td); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - WITNESS_SAVE(&mp->lock_object, mp); + WITNESS_SAVE(lock, lock_witness); + class = LOCK_CLASS(lock); if (cold || panicstr) { /* @@ -122,10 +124,9 @@ cvp->cv_waiters++; DROP_GIANT(); - mtx_unlock(mp); + lock_state = class->lc_unlock(lock); - sleepq_add(cvp, &mp->lock_object, cvp->cv_description, SLEEPQ_CONDVAR, - 0); + sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); sleepq_wait(cvp); #ifdef KTRACE @@ -133,8 +134,8 @@ ktrcsw(0, 0); #endif PICKUP_GIANT(); - mtx_lock(mp); - WITNESS_RESTORE(&mp->lock_object, mp); + class->lc_lock(lock, lock_state); + WITNESS_RESTORE(lock, lock_witness); } /* @@ -142,8 +143,9 @@ * not aquiring the mutex after condition variable was signaled. */ void -cv_wait_unlock(struct cv *cvp, struct mtx *mp) +_cv_wait_unlock(struct cv *cvp, struct lock_object *lock) { + struct lock_class *class; struct thread *td; td = curthread; @@ -151,9 +153,10 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - CV_ASSERT(cvp, mp, td); - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->lock_object, + CV_ASSERT(cvp, lock, td); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); + class = LOCK_CLASS(lock); if (cold || panicstr) { /* @@ -162,7 +165,7 @@ * thread or panic below, in case this is the idle * process and already asleep. */ - mtx_unlock(mp); + class->lc_unlock(lock); return; } @@ -170,10 +173,9 @@ cvp->cv_waiters++; DROP_GIANT(); - mtx_unlock(mp); + class->lc_unlock(lock); - sleepq_add(cvp, &mp->lock_object, cvp->cv_description, SLEEPQ_CONDVAR, - 0); + sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); sleepq_wait(cvp); #ifdef KTRACE @@ -190,12 +192,13 @@ * restarted if possible. */ int -cv_wait_sig(struct cv *cvp, struct mtx *mp) +_cv_wait_sig(struct cv *cvp, struct lock_object *lock) { + WITNESS_SAVE_DECL(lock_witness); + struct lock_class *class; struct thread *td; struct proc *p; - int rval; - WITNESS_SAVE_DECL(mp); + int lock_state, rval; td = curthread; p = td->td_proc; @@ -203,10 +206,11 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - CV_ASSERT(cvp, mp, td); - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->lock_object, + CV_ASSERT(cvp, lock, td); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - WITNESS_SAVE(&mp->lock_object, mp); + WITNESS_SAVE(lock, lock_witness); + class = LOCK_CLASS(lock); if (cold || panicstr) { /* @@ -222,9 +226,9 @@ cvp->cv_waiters++; DROP_GIANT(); - mtx_unlock(mp); + lock_state = class->lc_unlock(lock); - sleepq_add(cvp, &mp->lock_object, cvp->cv_description, SLEEPQ_CONDVAR | + sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR | SLEEPQ_INTERRUPTIBLE, 0); rval = sleepq_wait_sig(cvp); @@ -233,8 +237,8 @@ ktrcsw(0, 0); #endif PICKUP_GIANT(); - mtx_lock(mp); - WITNESS_RESTORE(&mp->lock_object, mp); + class->lc_lock(lock, lock_state); + WITNESS_RESTORE(lock, lock_witness); return (rval); } @@ -245,11 +249,12 @@ * expires. */ int -cv_timedwait(struct cv *cvp, struct mtx *mp, int timo) +_cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo) { + WITNESS_SAVE_DECL(lock_witness); + struct lock_class *class; struct thread *td; - int rval; - WITNESS_SAVE_DECL(mp); + int lock_state, rval; td = curthread; rval = 0; @@ -257,10 +262,11 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - CV_ASSERT(cvp, mp, td); - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->lock_object, + CV_ASSERT(cvp, lock, td); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - WITNESS_SAVE(&mp->lock_object, mp); + WITNESS_SAVE(lock, lock_witness); + class = LOCK_CLASS(lock); if (cold || panicstr) { /* @@ -276,10 +282,9 @@ cvp->cv_waiters++; DROP_GIANT(); - mtx_unlock(mp); + lock_state = class->lc_unlock(lock); - sleepq_add(cvp, &mp->lock_object, cvp->cv_description, SLEEPQ_CONDVAR, - 0); + sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0); sleepq_set_timeout(cvp, timo); rval = sleepq_timedwait(cvp); @@ -288,8 +293,8 @@ ktrcsw(0, 0); #endif PICKUP_GIANT(); - mtx_lock(mp); - WITNESS_RESTORE(&mp->lock_object, mp); + class->lc_lock(lock, lock_state); + WITNESS_RESTORE(lock, lock_witness); return (rval); } @@ -301,12 +306,13 @@ * a signal was caught. */ int -cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo) +_cv_timedwait_sig(struct cv *cvp, struct lock_object *lock, int timo) { + WITNESS_SAVE_DECL(lock_witness); + struct lock_class *class; struct thread *td; struct proc *p; - int rval; - WITNESS_SAVE_DECL(mp); + int lock_state, rval; td = curthread; p = td->td_proc; @@ -315,10 +321,11 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - CV_ASSERT(cvp, mp, td); - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->lock_object, + CV_ASSERT(cvp, lock, td); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - WITNESS_SAVE(&mp->lock_object, mp); + WITNESS_SAVE(lock, lock_witness); + class = LOCK_CLASS(lock); if (cold || panicstr) { /* @@ -334,9 +341,9 @@ cvp->cv_waiters++; DROP_GIANT(); - mtx_unlock(mp); + lock_state = class->lc_unlock(lock); - sleepq_add(cvp, &mp->lock_object, cvp->cv_description, SLEEPQ_CONDVAR | + sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR | SLEEPQ_INTERRUPTIBLE, 0); sleepq_set_timeout(cvp, timo); rval = sleepq_timedwait_sig(cvp); @@ -346,8 +353,8 @@ ktrcsw(0, 0); #endif PICKUP_GIANT(); - mtx_lock(mp); - WITNESS_RESTORE(&mp->lock_object, mp); + class->lc_lock(lock, lock_state); + WITNESS_RESTORE(lock, lock_witness); return (rval); } ==== //depot/projects/smpng/sys/sys/condvar.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/condvar.h,v 1.13 2005/12/12 00:02:22 rodrigc Exp $ + * $FreeBSD: src/sys/sys/condvar.h,v 1.14 2007/03/21 22:22:13 jhb Exp $ */ #ifndef _SYS_CONDVAR_H_ @@ -32,7 +32,7 @@ #ifndef LOCORE #include <sys/queue.h> -struct mtx; +struct lock_object; struct thread; TAILQ_HEAD(cv_waitq, thread); @@ -52,15 +52,26 @@ void cv_init(struct cv *cvp, const char *desc); void cv_destroy(struct cv *cvp); -void cv_wait(struct cv *cvp, struct mtx *mp); -void cv_wait_unlock(struct cv *cvp, struct mtx *mp); -int cv_wait_sig(struct cv *cvp, struct mtx *mp); -int cv_timedwait(struct cv *cvp, struct mtx *mp, int timo); -int cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo); +void _cv_wait(struct cv *cvp, struct lock_object *lock); +void _cv_wait_unlock(struct cv *cvp, struct lock_object *lock); +int _cv_wait_sig(struct cv *cvp, struct lock_object *lock); +int _cv_timedwait(struct cv *cvp, struct lock_object *lock, int timo); +int _cv_timedwait_sig(struct cv *cvp, struct lock_object *lock, int timo); void cv_signal(struct cv *cvp); void cv_broadcastpri(struct cv *cvp, int pri); +#define cv_wait(cvp, lock) \ + _cv_wait((cvp), &(lock)->lock_object) +#define cv_wait_unlock(cvp, lock) \ + _cv_wait_unlock((cvp), &(lock)->lock_object) +#define cv_wait_sig(cvp, lock) \ + _cv_wait_sig((cvp), &(lock)->lock_object) +#define cv_timedwait(cvp, lock, timo) \ + _cv_timedwait((cvp), &(lock)->lock_object, (timo)) +#define cv_timedwait_sig(cvp, lock, timo) \ + _cv_timedwait_sig((cvp), &(lock)->lock_object, (timo)) + #define cv_broadcast(cvp) cv_broadcastpri(cvp, -1) #define cv_wmesg(cvp) ((cvp)->cv_description) ==== //depot/projects/smpng/sys/sys/lock.h#45 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/lock.h,v 1.66 2007/03/21 21:20:51 jhb Exp $ + * $FreeBSD: src/sys/sys/lock.h,v 1.67 2007/03/21 22:18:10 jhb Exp $ */ #ifndef _SYS_LOCK_H_ @@ -325,16 +325,12 @@ * Helper macros to allow developers to add explicit lock order checks * wherever they please without having to actually grab a lock to do so. */ -#define witness_check_mutex(m) \ - WITNESS_CHECKORDER(&(m)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \ +#define witness_check(l) \ + WITNESS_CHECKORDER(&(l)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \ LOCK_LINE) -#define witness_check_shared_sx(sx) \ - WITNESS_CHECKORDER(&(sx)->lock_object, 0, LOCK_FILE, LOCK_LINE) +#define witness_check_shared(l) \ + WITNESS_CHECKORDER(&(l)->lock_object, 0, LOCK_FILE, LOCK_LINE) -#define witness_check_exclusive_sx(sx) \ - WITNESS_CHECKORDER(&(sx)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \ - LOCK_LINE) - #endif /* _KERNEL */ #endif /* _SYS_LOCK_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703220253.l2M2r381095742>