diff options
author | John Baldwin <jhb@FreeBSD.org> | 2001-03-28 09:03:24 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2001-03-28 09:03:24 +0000 |
commit | 192846463a5ff2cdf810b8c41e66af37bf83ae84 (patch) | |
tree | 395203e439ed33874e1d0934910a20ff89894137 /sys/i386/include/globaldata.h | |
parent | c31146a14e393cecdf6697f5dd3bf110597623e2 (diff) |
Rework the witness code to work with sx locks as well as mutexes.
- Introduce lock classes and lock objects. Each lock class specifies a
name and set of flags (or properties) shared by all locks of a given
type. Currently there are three lock classes: spin mutexes, sleep
mutexes, and sx locks. A lock object specifies properties of an
additional lock along with a lock name and all of the extra stuff needed
to make witness work with a given lock. This abstract lock stuff is
defined in sys/lock.h. The lockmgr constants, types, and prototypes have
been moved to sys/lockmgr.h. For temporary backwards compatability,
sys/lock.h includes sys/lockmgr.h.
- Replace proc->p_spinlocks with a per-CPU list, PCPU(spinlocks), of spin
locks held. By making this per-cpu, we do not have to jump through
magic hoops to deal with sched_lock changing ownership during context
switches.
- Replace proc->p_heldmtx, formerly a list of held sleep mutexes, with
proc->p_sleeplocks, which is a list of held sleep locks including sleep
mutexes and sx locks.
- Add helper macros for logging lock events via the KTR_LOCK KTR logging
level so that the log messages are consistent.
- Add some new flags that can be passed to mtx_init():
- MTX_NOWITNESS - specifies that this lock should be ignored by witness.
This is used for the mutex that blocks a sx lock for example.
- MTX_QUIET - this is not new, but you can pass this to mtx_init() now
and no events will be logged for this lock, so that one doesn't have
to change all the individual mtx_lock/unlock() operations.
- All lock objects maintain an initialized flag. Use this flag to export
a mtx_initialized() macro that can be safely called from drivers. Also,
we on longer walk the all_mtx list if MUTEX_DEBUG is defined as witness
performs the corresponding checks using the initialized flag.
- The lock order reversal messages have been improved to output slightly
more accurate file and line numbers.
Notes
Notes:
svn path=/head/; revision=74912
Diffstat (limited to 'sys/i386/include/globaldata.h')
-rw-r--r-- | sys/i386/include/globaldata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h index d2873efcbf0d..c83d73cb164b 100644 --- a/sys/i386/include/globaldata.h +++ b/sys/i386/include/globaldata.h @@ -65,6 +65,7 @@ struct globaldata { u_int gd_other_cpus; SLIST_ENTRY(globaldata) gd_allcpu; int gd_witness_spin_check; + struct lock_list_entry *gd_spinlocks; #ifdef KTR_PERCPU #ifdef KTR volatile int gd_ktr_idx; |