From ec6d5dd10f12c768cbb975d10e8631d80dbaedaf Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Thu, 22 Mar 2007 16:09:23 +0000
Subject: - Simplify the #ifdef's for adaptive mutexes and rwlocks by
 conditionally   defining a macro earlier in the file. - Add
 NO_ADAPTIVE_RWLOCKS option to disable adaptive spinning for rwlocks.

---
 sys/kern/kern_mutex.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'sys/kern/kern_mutex.c')

diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 987e5ec..9cff711 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -81,6 +81,10 @@ __FBSDID("$FreeBSD$");
 #define MUTEX_WAKE_ALL
 #endif
 
+#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES)
+#define	ADAPTIVE_MUTEXES
+#endif
+
 /*
  * Internal utility macros.
  */
@@ -299,7 +303,7 @@ void
 _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file,
     int line)
 {
-#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES)
+#ifdef ADAPTIVE_MUTEXES
 	volatile struct thread *owner;
 #endif
 #ifdef KTR
@@ -365,7 +369,7 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file,
 			continue;
 		}
 
-#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES)
+#ifdef ADAPTIVE_MUTEXES
 		/*
 		 * If the current owner of the lock is executing on another
 		 * CPU, spin instead of blocking.
@@ -383,7 +387,7 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file,
 			}
 			continue;
 		}
-#endif	/* SMP && !NO_ADAPTIVE_MUTEXES */
+#endif	/* ADAPTIVE_MUTEXES */
 
 		/*
 		 * We definitely must sleep for this lock.
@@ -498,7 +502,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
 	if (LOCK_LOG_TEST(&m->lock_object, opts))
 		CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p contested", m);
 
-#if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES)
+#ifdef ADAPTIVE_MUTEXES
 	if (ts == NULL) {
 		_release_lock_quick(m);
 		if (LOCK_LOG_TEST(&m->lock_object, opts))
-- 
cgit v1.1