Make ISC rwlock implementation the default again

Revert the change from ad03c22e976411cad743bc02746b803a2f119df7 as
further testing has shown that with hyper-threading disabled, named with
ISC rwlocks outperforms named with pthread rwlocks in cold cache testing
scenarios.  Since building named with pthread rwlocks might still be a
better choice for some workloads, keep the compile-time option which
enables that.

(cherry picked from commit 17101fd093508fe5020554d5e5ad826d940e3c8f)

diff --git a/configure b/configure
index 549d6c8f71ce9e67df321a4ff69ec612421cab1e..7ca5c2346a21e61723227b5fc2db84c026738412 100755 (executable)
--- a/configure
+++ b/configure
@@ -1625,9 +1625,8 @@ Optional Features:
   --enable-devpoll        use /dev/poll when available [default=yes]
   --disable-geoip         support GeoIP2 geolocation ACLs if available
                           [default=yes]
-  --disable-pthread-rwlock
-                          use internal rwlock implementation instead of
-                          pthread rwlock
+  --enable-pthread-rwlock use pthread rwlock instead of internal rwlock
+                          implementation
   --enable-fips-mode      enable FIPS mode in OpenSSL library [default=no]
   --enable-native-pkcs11  use native PKCS11 for public-key crypto [default=no]
   --enable-backtrace      log stack backtrace on abort [default=yes]
@@ -16047,7 +16046,7 @@ esac
 if test "${enable_pthread_rwlock+set}" = set; then :
   enableval=$enable_pthread_rwlock;
 else
-  enable_pthread_rwlock=yes
+  enable_pthread_rwlock=no
 fi
 
 

diff --git a/configure.ac b/configure.ac
index c69bc37ad11d9cf8c4d8c10a0ec5616cbc23e1aa..9d0bd6d1124ea2d722047704e0b7c2caf7d865ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -719,9 +719,9 @@ AC_SUBST(INSTALL_LIBRARY)
 # Do we want to use pthread rwlock?
 #
 AC_ARG_ENABLE([pthread_rwlock],
-             [AS_HELP_STRING([--disable-pthread-rwlock],
-                             [use internal rwlock implementation instead of pthread rwlock])],
-             [], [enable_pthread_rwlock=yes])
+             [AS_HELP_STRING([--enable-pthread-rwlock],
+                             [use pthread rwlock instead of internal rwlock implementation])],
+             [], [enable_pthread_rwlock=no])
 
 AS_IF([test "$enable_pthread_rwlock" = "yes"],
       [AC_CHECK_FUNCS([pthread_rwlock_rdlock], [],