From 274a5f2851f071452cd2197de7ba97261c06db21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= Date: Fri, 17 Apr 2020 15:09:59 +0200 Subject: [PATCH] Always use MAX_ADAPTIVE_COUNT --- lib/isc/rwlock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 2aa53ae457..d1973097cf 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -421,8 +421,8 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { isc_result_t isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { int32_t cnt = 0; - int32_t spins = atomic_load_acquire(&rwl->spins) * 2 + 10; - int32_t max_cnt = ISC_MAX(spins, RWLOCK_MAX_ADAPTIVE_COUNT); +// int32_t spins = atomic_load_acquire(&rwl->spins) * 2 + 10; + int32_t max_cnt = RWLOCK_MAX_ADAPTIVE_COUNT; // ISC_MAX(spins, RWLOCK_MAX_ADAPTIVE_COUNT); isc_result_t result = ISC_R_SUCCESS; do { @@ -433,7 +433,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { isc_rwlock_pause(); } while (isc_rwlock_trylock(rwl, type) != ISC_R_SUCCESS); - atomic_fetch_add_release(&rwl->spins, (cnt - spins) / 8); +// atomic_fetch_add_release(&rwl->spins, (cnt - spins) / 8); return (result); }