Don't set buf sizes - use system defaults

This reverts commit a062ca539d.

lib/isc/netmgr/udp.c

@@ -146,10 +146,6 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
 		isc__nm_incstats(sock->mgr, sock->statsindex[STATID_BINDFAIL]);
 	}
 
-	uv_recv_buffer_size(&sock->uv_handle.handle,
-			    &(int){ 16 * 1024 * 1024 });
-	uv_send_buffer_size(&sock->uv_handle.handle,
-			    &(int){ 16 * 1024 * 1024 });
 	uv_udp_recv_start(&sock->uv_handle.udp, isc__nm_alloc_cb, udp_recv_cb);
 }
 

lib/isc/rwlock.c

@@ -36,7 +36,13 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
 		unsigned int write_quota) {
 	UNUSED(read_quota);
 	UNUSED(write_quota);
-	REQUIRE(pthread_rwlock_init(&rwl->rwlock, NULL) == 0);
+	if (1) {
+		pthread_rwlockattr_t attr;
+		pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_READER_NP);
+		REQUIRE(pthread_rwlock_init(&rwl->rwlock, &attr) == 0);
+	} else {
+		REQUIRE(pthread_rwlock_init(&rwl->rwlock, NULL) == 0);
+	}
 	atomic_init(&rwl->downgrade, false);
 	return (ISC_R_SUCCESS);
 }
@@ -130,18 +136,6 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
 #define RWLOCK_MAGIC	  ISC_MAGIC('R', 'W', 'L', 'k')
 #define VALID_RWLOCK(rwl) ISC_MAGIC_VALID(rwl, RWLOCK_MAGIC)
 
-#ifndef RWLOCK_DEFAULT_READ_QUOTA
-#define RWLOCK_DEFAULT_READ_QUOTA 4
-#endif /* ifndef RWLOCK_DEFAULT_READ_QUOTA */
-
-#ifndef RWLOCK_DEFAULT_WRITE_QUOTA
-#define RWLOCK_DEFAULT_WRITE_QUOTA 4
-#endif /* ifndef RWLOCK_DEFAULT_WRITE_QUOTA */
-
-#ifndef RWLOCK_MAX_ADAPTIVE_COUNT
-#define RWLOCK_MAX_ADAPTIVE_COUNT 100
-#endif /* ifndef RWLOCK_MAX_ADAPTIVE_COUNT */
-
 #if defined(_MSC_VER)
 #include <intrin.h>
 #define isc_rwlock_pause() YieldProcessor()

lib/isc/unix/socket.c

@@ -1943,6 +1943,8 @@ free_socket(isc__socket_t **socketp) {
 
 	isc_mem_put(sock->manager->mctx, sock, sizeof(*sock));
 }
+#undef SO_RCVBUF
+#undef SO_SNDBUF
 
 #ifdef SO_RCVBUF
 static isc_once_t rcvbuf_once = ISC_ONCE_INIT;

util/git-replay-merge.sh

@@ -14,7 +14,7 @@ set -e
 SELF="$(basename $0)"
 SELF="${SELF/-/ }"
 
-STATE_FILE=".git/REPLAY_MERGE"
+STATE_FILE="REPLAY_MERGE"
 DONT_PUSH=${DONT_PUSH:=false}
 DONT_ACCEPT=${DONT_ACCEPT:=false}
 
@@ -62,9 +62,10 @@ die_before_push() {
 }
 
 die_if_wrong_dir() {
-	if [[ ! -d ".git" ]]; then
-		die "You need to run this command from the toplevel of the working tree."
-	fi
+#	if [[ ! -d ".git" ]]; then
+	echo	die "You need to run this command from the toplevel of the working tree."
+#	fi
+
 }
 
 die_if_not_in_progress() {