diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-28 20:27:57 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-28 20:27:57 +0000 |
| commit | 15969dfa68e37d305dd11968e20ca0a425d2092a (patch) | |
| tree | ff5f69008da4bbcba278d383b53bb927776d4644 /sys/arch/vax | |
| parent | 23487e0f53f72934a66dcf7e42b399ec6562e966 (diff) | |
Implement a per-cpu held mutex counter if DIAGNOSTIC on all non-x86 platforms,
to complete matthew@'s commit of a few days ago, and drop __HAVE_CPU_MUTEX_LEVEL
define. With help from, and ok deraadt@.
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/include/cpu.h | 5 | ||||
| -rw-r--r-- | sys/arch/vax/vax/mutex.c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index 82f9ee60f2b..e2b276e805c 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.35 2009/03/26 17:24:33 oga Exp $ */ +/* $OpenBSD: cpu.h,v 1.36 2010/09/28 20:27:56 miod Exp $ */ /* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */ /* @@ -53,6 +53,9 @@ struct cpu_info { struct schedstate_percpu ci_schedstate; /* scheduler state */ u_int32_t ci_randseed; +#ifdef DIAGNOSTIC + int ci_mutex_level; +#endif }; extern struct cpu_info cpu_info_store; diff --git a/sys/arch/vax/vax/mutex.c b/sys/arch/vax/vax/mutex.c index 4b1ba96ae0e..d960eab3f1e 100644 --- a/sys/arch/vax/vax/mutex.c +++ b/sys/arch/vax/vax/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.4 2009/08/13 13:24:55 weingart Exp $ */ +/* $OpenBSD: mutex.c,v 1.5 2010/09/28 20:27:56 miod Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -55,6 +55,9 @@ mtx_enter(struct mutex *mtx) MUTEX_ASSERT_UNLOCKED(mtx); mtx->mtx_lock = 1; +#ifdef DIAGNOSTIC + curcpu()->ci_mutex_level++; +#endif } int @@ -64,6 +67,9 @@ mtx_enter_try(struct mutex *mtx) mtx->mtx_oldipl = _splraise(mtx->mtx_wantipl); MUTEX_ASSERT_UNLOCKED(mtx); mtx->mtx_lock = 1; +#ifdef DIAGNOSTIC + curcpu()->ci_mutex_level++; +#endif return 1; } @@ -72,6 +78,9 @@ void mtx_leave(struct mutex *mtx) { MUTEX_ASSERT_LOCKED(mtx); +#ifdef DIAGNOSTIC + curcpu()->ci_mutex_level--; +#endif mtx->mtx_lock = 0; if (mtx->mtx_wantipl != IPL_NONE) splx(mtx->mtx_oldipl); |