Reserve space for NULL

Silence a compiler warning on openbsd and fix windows build

See merge request isc-projects/bind9!603

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
   DOCKER_DRIVER: overlay2
   CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
   CCACHE_DIR: "/ccache"
+  CMDPREFIX: "bash -c"
 
 stages:
   - precheck
@@ -114,8 +115,8 @@ stages:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
 #    - ./autogen.sh
   script:
-    - ./configure --enable-developer --with-libtool --disable-static --with-atf=/usr $EXTRA_CONFIGURE
-    - make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1
+    - $CMDPREFIX "./configure --enable-developer --with-libtool --disable-static --with-atf=/usr $EXTRA_CONFIGURE"
+    - $CMDPREFIX "make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1"
   artifacts:
     expire_in: '1 hour'
     untracked: true
@@ -129,8 +130,8 @@ stages:
     - echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
     - if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
   script:
-    - ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
-    - test -s bin/tests/system/systests.output
+    - $CMDPREFIX bash -x "cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1"
+    - $CMDPREFIX bash -x "test -s bin/tests/system/systests.output"
   artifacts:
     untracked: true
     expire_in: '1 week'
@@ -144,7 +145,7 @@ stages:
     - echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
     - if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
   script:
-    - make unit
+    - $CMDPREFIX "make unit"
   after_script:
     - kyua report-html --force --results-file kyua.results --results-filter "" --output kyua_html
   artifacts:
@@ -203,6 +204,7 @@ build:centos:centos6:amd64:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
     EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error"
+    CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *build_job
 
@@ -211,6 +213,7 @@ build:centos:centos7:amd64:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
     EXTRA_CONFIGURE: "--with-libidn2"
+    CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *build_job
 
@@ -261,12 +264,16 @@ build:debian:sid:i386:
   <<: *build_job
 
 unittest:centos:centos6:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *unit_test_job
   dependencies:
     - build:centos:centos6:amd64
 
 unittest:centos:centos7:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *unit_test_job
   dependencies:
@@ -303,12 +310,16 @@ unittest:debian:sid:i386:
     - build:debian:sid:i386
 
 systemtest:centos:centos6:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *system_test_job
   dependencies:
     - build:centos:centos6:amd64
 
 systemtest:centos:centos7:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *system_test_job
   dependencies:

CHANGES

@@ -1,3 +1,8 @@
+5006.	[cleanup]	Code preparing a delegation response was extracted from
+			query_delegation() and query_zone_delegation() into a
+			separate function in order to decrease code
+			duplication. [GL #431]
+
 5005.	[bug]		dnssec-verify, and dnssec-signzone at the verification
 			step, failed on some validly signed zones. [GL #442]
 

bin/named/controlconf.c

@@ -449,7 +449,8 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
 		goto cleanup_request;
 	}
 
-	result = isc_buffer_allocate(listener->mctx, &text, 2 * 2048);
+	result = isc_buffer_allocate(listener->mctx, &text, 4 * 2048); /* TODO!!!: Kill magic constants */
+	memset(isc_buffer_base(text), 0, isc_buffer_length(text));
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_request;
 

bin/named/server.c

@@ -4577,7 +4577,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 		dns_peerlist_detach(&view->peers);
 		view->peers = newpeers; /* Transfer ownership. */
 	}
-
+	
 	/*
 	 *	Configure the views rrset-order.
 	 */
@@ -4705,7 +4705,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 	result = named_config_get(maps, "root-key-sentinel", &obj);
 	INSIST(result == ISC_R_SUCCESS);
 	view->root_key_sentinel = cfg_obj_asboolean(obj);
-
+	
 	CHECK(configure_view_acl(vconfig, config, named_g_config,
 				 "allow-query-cache-on", NULL, actx,
 				 named_g_mctx, &view->cacheonacl));
@@ -5103,7 +5103,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 	 * "security roots".
 	 */
 	CHECK(configure_view_dnsseckeys(view, vconfig, config, bindkeys,
-					auto_root, mctx));
+					auto_root, mctx));	
 	dns_resolver_resetmustbesecure(view->resolver);
 	obj = NULL;
 	result = named_config_get(maps, "dnssec-must-be-secure", &obj);
@@ -6170,7 +6170,7 @@ add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) {
 	/* No existing keydata zone was found; create one */
 	CHECK(dns_zonemgr_createzone(named_g_server->zonemgr, &zone));
 	CHECK(dns_zone_setorigin(zone, dns_rootname));
-
+	
 	defaultview = ISC_TF(strcmp(view->name, "_default") == 0);
 	CHECK(isc_file_sanitize(directory,
 				defaultview ? "managed-keys" : view->name,
@@ -7845,7 +7845,7 @@ load_configuration(const char *filename, named_server_t *server,
 	unsigned int initial, idle, keepalive, advertised;
 	dns_aclenv_t *env =
 		ns_interfacemgr_getaclenv(named_g_server->interfacemgr);
-
+	
 	ISC_LIST_INIT(viewlist);
 	ISC_LIST_INIT(builtin_viewlist);
 	ISC_LIST_INIT(cachelist);
@@ -8675,6 +8675,7 @@ load_configuration(const char *filename, named_server_t *server,
 	}
 #endif /* HAVE_LMDB */
 
+
 	/*
 	 * Configure the logging system.
 	 *
@@ -11282,7 +11283,7 @@ named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) {
 	else
 		count = strtoul(ptr, NULL, 10);
 
-	CHECK(isc_buffer_reserve(text, count));
+	CHECK(isc_buffer_reserve(text, count + 1));
 	for (i = 0; i < count; i++)
 		CHECK(putuint8(text, chars[i % (sizeof(chars) - 1)]));
 

bin/tests/system/dyndb/driver/db.c

@@ -90,8 +90,10 @@ detach(dns_db_t **dbp) {
 	REQUIRE(VALID_SAMPLEDB(sampledb));
 
 	isc_refcount_decrement(&sampledb->refs, &refs);
-	if (refs == 0)
+	if (refs == 0) {
+		isc_refcount_destroy(&sampledb->refs);
 		free_sampledb(sampledb);
+	}
 	*dbp = NULL;
 }
 
@@ -770,7 +772,7 @@ create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
 
 	CHECK(dns_name_dupwithoffsets(origin, mctx, &sampledb->common.origin));
 
-	CHECK(isc_refcount_init(&sampledb->refs, 1));
+	isc_refcount_init(&sampledb->refs, 1);
 
 	/* Translate instance name to instance pointer. */
 	sampledb->inst = driverarg;

bin/tests/system/mirror/ns2/named.conf.in

@@ -36,7 +36,7 @@ zone "example" {
 
 zone "sub.example" {
 	type master;
-	file "sub.example.db.in";
+	file "sub.example.db.signed";
 };
 
 zone "initially-unavailable" {

bin/tests/system/mirror/ns2/sign.sh

@@ -14,7 +14,7 @@ SYSTEMTESTTOP=../..
 
 keys_to_trust=""
 
-for zonename in example initially-unavailable; do
+for zonename in sub.example example initially-unavailable; do
 	zone=$zonename
 	infile=$zonename.db.in
 	zonefile=$zonename.db
@@ -24,7 +24,7 @@ for zonename in example initially-unavailable; do
 
 	cat $infile $keyname1.key $keyname2.key > $zonefile
 
-	$SIGNER -P -o $zone $zonefile > /dev/null
+	$SIGNER -P -g -o $zone $zonefile > /dev/null
 done
 
 # Only add the key for "initially-unavailable" to the list of keys trusted by

bin/tests/system/mirror/tests.sh

@@ -204,6 +204,21 @@ grep "${UPDATED_SERIAL_GOOD}.*; serial" dig.out.ns3.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
+n=`expr $n + 1`
+echo_i "checking delegations sourced from a mirror zone ($n)"
+ret=0
+$DIG $DIGOPTS @10.53.0.3 foo.example A +norec > dig.out.ns3.test$n 2>&1 || ret=1
+# Check response code and flags in the answer.
+grep "NOERROR" dig.out.ns3.test$n > /dev/null || ret=1
+grep "flags:.* ad" dig.out.ns3.test$n > /dev/null && ret=1
+# Check that a delegation containing a DS RRset and glue is present.
+grep "ANSWER: 0" dig.out.ns3.test$n > /dev/null || ret=1
+grep "example.*IN.*NS" dig.out.ns3.test$n > /dev/null || ret=1
+grep "example.*IN.*DS" dig.out.ns3.test$n > /dev/null || ret=1
+grep "ns2.example.*A.*10.53.0.2" dig.out.ns3.test$n > /dev/null || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
 n=`expr $n + 1`
 echo_i "checking that resolution involving a mirror zone works as expected ($n)"
 ret=0
@@ -238,14 +253,16 @@ ret=0
 $DIG $DIGOPTS @10.53.0.3 sub.example. NS > dig.out.ns3.test$n.1 2>&1 || ret=1
 # Ensure the child-side NS RRset is returned.
 grep "NOERROR" dig.out.ns3.test$n.1 > /dev/null || ret=1
-grep "ANSWER: 1" dig.out.ns3.test$n.1 > /dev/null || ret=1
+grep "ANSWER: 2" dig.out.ns3.test$n.1 > /dev/null || ret=1
 grep "sub.example.*IN.*NS" dig.out.ns3.test$n.1 > /dev/null || ret=1
 # Issue a non-recursive query for something below the cached zone cut.
 $DIG $DIGOPTS @10.53.0.3 +norec foo.sub.example. A > dig.out.ns3.test$n.2 2>&1 || ret=1
-# Ensure the cached NS RRset is returned in a delegation.
+# Ensure the cached NS RRset is returned in a delegation, along with the
+# parent-side DS RRset.
 grep "NOERROR" dig.out.ns3.test$n.2 > /dev/null || ret=1
 grep "ANSWER: 0" dig.out.ns3.test$n.2 > /dev/null || ret=1
 grep "sub.example.*IN.*NS" dig.out.ns3.test$n.2 > /dev/null || ret=1
+grep "sub.example.*IN.*DS" dig.out.ns3.test$n.2 > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 

bin/tests/system/rrsetorder/tests.sh

@@ -17,6 +17,9 @@ DIGCMD="$DIG $DIGOPTS -p ${PORT}"
 
 status=0
 
+GOOD_RANDOM="$(seq 1 24)"
+GOOD_RANDOM_NO=24
+
 if grep "^#define DNS_RDATASET_FIXED" $TOP/config.h > /dev/null 2>&1 ; then
     test_fixed=true
 else
@@ -115,7 +118,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 echo_i "Checking order random (master)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -123,7 +126,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
     $DIGCMD @10.53.0.1 random.example > dig.out.random || ret=1
     match=0
-    for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+    for j in $GOOD_RANDOM
     do
 	eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
@@ -131,12 +134,12 @@ do
     if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Random selection return $match of 24 possible orders in 36 samples"
-if [ $match -lt 8 ]; then ret=1; fi
+echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
+if [ $match -lt $(((${GOOD_RANDOM_NO}/3))) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
@@ -209,7 +212,7 @@ status=`expr $status + $ret`
 
 echo_i "Checking order random (slave)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -217,7 +220,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
     $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
     match=0
-    for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+    for j in $GOOD_RANDOM
     do
 	eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
@@ -225,12 +228,12 @@ do
     if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Random selection return $match of 24 possible orders in 36 samples"
-if [ $match -lt 8 ]; then ret=1; fi
+echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
+if [ $match -lt $(((${GOOD_RANDOM_NO}/3))) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
@@ -319,7 +322,7 @@ status=`expr $status + $ret`
 
 echo_i "Checking order random (slave loaded from disk)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -327,7 +330,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
 	$DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
 	match=0
-	for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+	for j in $GOOD_RANDOM
 	do
 		eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
 		if [ $match -eq 1 ]; then break; fi
@@ -335,12 +338,12 @@ do
 	if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Random selection return $match of 24 possible orders in 36 samples"
-if [ $match -lt 8 ]; then ret=1; fi
+echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
+if [ $match -lt $(((${GOOD_RANDOM_NO}/3))) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
@@ -417,7 +420,7 @@ status=`expr $status + $ret`
 
 echo_i "Checking order random (cache)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -425,7 +428,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
 	$DIGCMD @10.53.0.3 random.example > dig.out.random || ret=1
 	match=0
-	for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+	for j in $GOOD_RANDOM
 	do
 		eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
 		if [ $match -eq 1 ]; then break; fi
@@ -433,17 +436,17 @@ do
 	if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Random selection return $match of 24 possible orders in 36 samples"
-if [ $match -lt 8 ]; then ret=1; fi
+echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
+if [ $match -lt $(((${GOOD_RANDOM_NO}/3))) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 
 echo_i "Checking default order (cache)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -451,7 +454,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
 	$DIGCMD @10.53.0.5 random.example > dig.out.random || ret=1
 	match=0
-	for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+	for j in $GOOD_RANDOM
 	do
 		eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
 		if [ $match -eq 1 ]; then break; fi
@@ -459,17 +462,17 @@ do
 	if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Default selection return $match of 24 possible orders in 36 samples"
-if [ $match -lt 8 ]; then ret=1; fi
+echo_i "Default selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
+if [ $match -lt $(((${GOOD_RANDOM_NO}/3))) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 
 echo_i "Checking default order no match in rrset-order (no shuffling)"
 ret=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 	eval match$i=0
 done
@@ -477,7 +480,7 @@ for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
 $DIGCMD @10.53.0.4 nomatch.example > dig.out.nomatch|| ret=1
 	match=0
-	for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+	for j in $GOOD_RANDOM
 	do
 		eval "$DIFF dig.out.nomatch dig.out.random.good$j >/dev/null && match$j=1 match=1"
 		if [ $match -eq 1 ]; then break; fi
@@ -485,11 +488,11 @@ $DIGCMD @10.53.0.4 nomatch.example > dig.out.nomatch|| ret=1
 	if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+for i in $GOOD_RANDOM
 do
 eval "match=\`expr \$match + \$match$i\`"
 done
-echo_i "Consistent selection return $match of 24 possible orders in 36 samples"
+echo_i "Consistent selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
 if [ $match -ne 1 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 

contrib/dlz/drivers/sdlz_helper.c

@@ -68,8 +68,6 @@ destroy_querylist(isc_mem_t *mctx, query_list_t **querylist)
 	query_segment_t *tseg = NULL;
 	query_segment_t *nseg = NULL;
 
-	REQUIRE(mctx != NULL);
-
 	/* if query list is null, nothing to do */
 	if (*querylist == NULL)
 		return;
@@ -111,7 +109,6 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone,
 	char *last;
 
 	REQUIRE(querylist != NULL && *querylist == NULL);
-	REQUIRE(mctx != NULL);
 
 	/* if query string is null, or zero length */
 	if (query_str == NULL || strlen(query_str) < 1) {
@@ -280,7 +277,6 @@ sdlzh_build_querystring(isc_mem_t *mctx, query_list_t *querylist)
 	unsigned int length = 0;
 	char *qs = NULL;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(querylist != NULL);
 
 	/* start at the top of the list */
@@ -333,7 +329,6 @@ sdlzh_build_sqldbinstance(isc_mem_t *mctx, const char *allnodes_str,
 	dbinstance_t *db = NULL;
 
 	REQUIRE(dbi != NULL && *dbi == NULL);
-	REQUIRE(mctx != NULL);
 
 	/* allocate and zero memory for driver structure */
 	db = isc_mem_get(mctx, sizeof(dbinstance_t));
@@ -501,8 +496,6 @@ sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char* key)
 	if (keystart == NULL)
 		return NULL;
 
-	REQUIRE(mctx != NULL);
-
 	for (i = 0; i < 255; i++) {
 		value[i] = keystart[keylen + i];
 		if (value[i] == ' ' || value[i] == '\0') {

doc/arm/Bv9ARM.ch05.html

@@ -6779,7 +6779,8 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
                   </td>
 <td>
                     <p>
-                      Records are returned in some random order.
+                      Records are returned in some random order. When no
+                      ordering is specified, this is the default.
                     </p>
                   </td>
 </tr>
@@ -6810,8 +6811,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
                       Records are returned in whatever order they were
                       retrieved from the database.  This order is
                       indeterminate, but will be consistent as long as the
-                      database is not modified. When no ordering is
-                      specified, this is the default.
+                      database is not modified.
                     </p>
                   </td>
 </tr>

doc/dev/dev.md

@@ -584,7 +584,6 @@ memory context is freed before all references have been cleaned up.
         isc_foo_create(isc_mem_t *mctx, isc_foo_t **foop) {
                 isc_foo_t *foo;
 
-                REQUIRE(mctx != NULL);
                 REQUIRE(foop != NULL && *foop == NULL);
 
                 foo = isc_mem_get(mctx, sizeof(isc_foo_t))

lib/dns/acl.c

@@ -47,11 +47,7 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) {
 
 	acl->name = NULL;
 
-	result = isc_refcount_init(&acl->refcount, 1);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, acl, sizeof(*acl));
-		return (result);
-	}
+	isc_refcount_init(&acl->refcount, 1);
 
 	result = dns_iptable_create(mctx, &acl->iptable);
 	if (result != ISC_R_SUCCESS) {
@@ -476,7 +472,6 @@ destroy(dns_acl_t *dacl) {
 		isc_mem_free(dacl->mctx, dacl->name);
 	if (dacl->iptable != NULL)
 		dns_iptable_detach(&dacl->iptable);
-	isc_refcount_destroy(&dacl->refcount);
 	dacl->magic = 0;
 	isc_mem_putanddetach(&dacl->mctx, dacl, sizeof(*dacl));
 }
@@ -489,8 +484,10 @@ dns_acl_detach(dns_acl_t **aclp) {
 	REQUIRE(DNS_ACL_VALID(acl));
 
 	isc_refcount_decrement(&acl->refcount, &refs);
-	if (refs == 0)
+	if (refs == 0) {
+		isc_refcount_destroy(&acl->refcount);
 		destroy(acl);
+	}
 	*aclp = NULL;
 }
 

lib/dns/adb.c

@@ -2526,7 +2526,6 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
 	isc_result_t result;
 	unsigned int i;
 
-	REQUIRE(mem != NULL);
 	REQUIRE(view != NULL);
 	REQUIRE(timermgr != NULL); /* this is actually unused */
 	REQUIRE(taskmgr != NULL);

lib/dns/badcache.c

@@ -64,7 +64,6 @@ dns_badcache_init(isc_mem_t *mctx, unsigned int size, dns_badcache_t **bcp) {
 	dns_badcache_t *bc = NULL;
 
 	REQUIRE(bcp != NULL && *bcp == NULL);
-	REQUIRE(mctx != NULL);
 
 	bc = isc_mem_get(mctx, sizeof(dns_badcache_t));
 	if (bc == NULL)

lib/dns/cache.c

@@ -187,8 +187,6 @@ dns_cache_create(isc_mem_t *cmctx, isc_mem_t *hmctx, isc_taskmgr_t *taskmgr,
 
 	REQUIRE(cachep != NULL);
 	REQUIRE(*cachep == NULL);
-	REQUIRE(cmctx != NULL);
-	REQUIRE(hmctx != NULL);
 	REQUIRE(cachename != NULL);
 
 	cache = isc_mem_get(cmctx, sizeof(*cache));

lib/dns/catz.c

@@ -249,10 +249,10 @@ dns_catz_entry_detach(dns_catz_zone_t *zone, dns_catz_entry_t **entryp) {
 
 	isc_refcount_decrement(&entry->refs, &refs);
 	if (refs == 0) {
+		isc_refcount_destroy(&entry->refs);
 		dns_catz_options_free(&entry->opts, mctx);
 		if (dns_name_dynamic(&entry->name))
 			dns_name_free(&entry->name, mctx);
-		isc_refcount_destroy(&entry->refs);
 		isc_mem_put(mctx, entry, sizeof(dns_catz_entry_t));
 	}
 }
@@ -565,9 +565,7 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_newzones;
 
-	result = isc_refcount_init(&new_zones->refs, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup_mutex;
+	isc_refcount_init(&new_zones->refs, 1);
 
 	result = isc_ht_init(&new_zones->zones, mctx, 4);
 	if (result != ISC_R_SUCCESS)
@@ -589,7 +587,6 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
 	isc_ht_destroy(&new_zones->zones);
   cleanup_refcount:
 	isc_refcount_destroy(&new_zones->refs);
-  cleanup_mutex:
 	isc_mutex_destroy(&new_zones->lock);
   cleanup_newzones:
 	isc_mem_put(mctx, new_zones, sizeof(*new_zones));
@@ -754,6 +751,7 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) {
 	*zonep = NULL;
 	isc_refcount_decrement(&zone->refs, &refs);
 	if (refs == 0) {
+		isc_refcount_destroy(&zone->refs);
 		if (zone->entries != NULL) {
 			result = isc_ht_iter_create(zone->entries, &iter);
 			INSIST(result == ISC_R_SUCCESS);
@@ -775,7 +773,6 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) {
 		}
 		mctx = zone->catzs->mctx;
 		isc_timer_detach(&zone->updatetimer);
-		isc_refcount_destroy(&zone->refs);
 		if (zone->db_registered == ISC_TRUE) {
 			result = dns_db_updatenotify_unregister(zone->db,
 						    dns_catz_dbupdate_callback,
@@ -814,6 +811,7 @@ dns_catz_catzs_detach(dns_catz_zones_t ** catzsp) {
 	isc_refcount_decrement(&catzs->refs, &refs);
 
 	if (refs == 0) {
+		isc_refcount_destroy(&catzs->refs);
 		DESTROYLOCK(&catzs->lock);
 		if (catzs->zones != NULL) {
 			result = isc_ht_iter_create(catzs->zones, &iter);
@@ -830,7 +828,6 @@ dns_catz_catzs_detach(dns_catz_zones_t ** catzsp) {
 			INSIST(isc_ht_count(catzs->zones) == 0);
 			isc_ht_destroy(&catzs->zones);
 		}
-		isc_refcount_destroy(&catzs->refs);
 		isc_task_destroy(&catzs->updater);
 		isc_mem_putanddetach(&catzs->mctx, catzs, sizeof(*catzs));
 	}

lib/dns/client.c

@@ -438,7 +438,6 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx,
 	dns_dispatch_t *dispatchv6 = NULL;
 	dns_view_t *view = NULL;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(taskmgr != NULL);
 	REQUIRE(timermgr != NULL);
 	REQUIRE(socketmgr != NULL);
@@ -709,7 +708,6 @@ static isc_result_t
 getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) {
 	dns_rdataset_t *rdataset;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(rdatasetp != NULL && *rdatasetp == NULL);
 
 	rdataset = isc_mem_get(mctx, sizeof(*rdataset));

lib/dns/compress.c

@@ -142,7 +142,6 @@ static unsigned char tableindex[256] = {
 isc_result_t
 dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) {
 	REQUIRE(cctx != NULL);
-	REQUIRE(mctx != NULL);	/* See: rdataset.c:towiresorted(). */
 
 	cctx->edns = edns;
 	cctx->mctx = mctx;

lib/dns/dbtable.c

@@ -53,7 +53,6 @@ dns_dbtable_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 	dns_dbtable_t *dbtable;
 	isc_result_t result;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(dbtablep != NULL && *dbtablep == NULL);
 
 	dbtable = (dns_dbtable_t *)isc_mem_get(mctx, sizeof(*dbtable));

lib/dns/dispatch.c

@@ -1739,7 +1739,6 @@ dns_dispatchmgr_create(isc_mem_t *mctx, dns_dispatchmgr_t **mgrp)
 	isc_portset_t *v4portset = NULL;
 	isc_portset_t *v6portset = NULL;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(mgrp != NULL && *mgrp == NULL);
 
 	mgr = isc_mem_get(mctx, sizeof(dns_dispatchmgr_t));
@@ -2045,31 +2044,38 @@ dns_dispatchmgr_setudp(dns_dispatchmgr_t *mgr,
 		}
 		UNLOCK(&mgr->buffer_lock);
 		return (ISC_R_SUCCESS);
-	}
-	result = isc_mempool_create(mgr->mctx, sizeof(dispsocket_t),
+	} else {
+		result = isc_mempool_create(mgr->mctx, sizeof(dispsocket_t),
 				    &mgr->spool);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
+		if (result != ISC_R_SUCCESS)
+			goto cleanup;
 
-	isc_mempool_setname(mgr->spool, "dispmgr_spool");
-	isc_mempool_setmaxalloc(mgr->spool, maxrequests);
-	isc_mempool_setfreemax(mgr->spool, maxrequests);
-	isc_mempool_associatelock(mgr->spool, &mgr->spool_lock);
-	isc_mempool_setfillcount(mgr->spool, 32);
-
-	result = qid_allocate(mgr, buckets, increment, &mgr->qid, ISC_TRUE);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
+		isc_mempool_setname(mgr->spool, "dispmgr_spool");
+		isc_mempool_setmaxalloc(mgr->spool, maxrequests);
+		isc_mempool_setfreemax(mgr->spool, maxrequests);
+		isc_mempool_associatelock(mgr->spool, &mgr->spool_lock);
+		isc_mempool_setfillcount(mgr->spool, 32);
+	}
 
+	if (mgr->qid == NULL) {
+		result = qid_allocate(mgr, buckets, increment, &mgr->qid, ISC_TRUE);
+		if (result != ISC_R_SUCCESS)
+			goto cleanup;	
+	}
+	
 	mgr->buffersize = buffersize;
 	mgr->maxbuffers = maxbuffers;
+
 	UNLOCK(&mgr->buffer_lock);
 	return (ISC_R_SUCCESS);
 
  cleanup:
-	isc_mempool_destroy(&mgr->bpool);
-	if (mgr->spool != NULL)
+	if (mgr->bpool != NULL) {
+		isc_mempool_destroy(&mgr->bpool);
+	}
+	if (mgr->spool != NULL) {
 		isc_mempool_destroy(&mgr->spool);
+	}
 	UNLOCK(&mgr->buffer_lock);
 	return (result);
 }

lib/dns/dlz.c

@@ -166,7 +166,6 @@ dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername,
 	REQUIRE(dbp != NULL && *dbp == NULL);
 	REQUIRE(dlzname != NULL);
 	REQUIRE(drivername != NULL);
-	REQUIRE(mctx != NULL);
 
 	/* write log message */
 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
@@ -287,7 +286,6 @@ dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods,
 	REQUIRE(methods->create != NULL);
 	REQUIRE(methods->destroy != NULL);
 	REQUIRE(methods->findzone != NULL);
-	REQUIRE(mctx != NULL);
 	REQUIRE(dlzimp != NULL && *dlzimp == NULL);
 
 	/*

lib/dns/dnssec.c

@@ -142,7 +142,6 @@ dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata,
 
 	INSIST(name != NULL);
 	INSIST(rdata != NULL);
-	INSIST(mctx != NULL);
 	INSIST(key != NULL);
 	INSIST(*key == NULL);
 	REQUIRE(rdata->type == dns_rdatatype_key ||
@@ -208,7 +207,6 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 	REQUIRE(key != NULL);
 	REQUIRE(inception != NULL);
 	REQUIRE(expire != NULL);
-	REQUIRE(mctx != NULL);
 	REQUIRE(sigrdata != NULL);
 
 	if (*inception >= *expire)
@@ -384,7 +382,6 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 	REQUIRE(name != NULL);
 	REQUIRE(set != NULL);
 	REQUIRE(key != NULL);
-	REQUIRE(mctx != NULL);
 	REQUIRE(sigrdata != NULL && sigrdata->type == dns_rdatatype_rrsig);
 
 	ret = dns_rdata_tostruct(sigrdata, &sig, NULL);

lib/dns/dnstap.c

@@ -212,7 +212,7 @@ dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path,
 
 	memset(env, 0, sizeof(dns_dtenv_t));
 
-	CHECK(isc_refcount_init(&env->refcount, 1));
+	isc_refcount_init(&env->refcount, 1);
 	CHECK(isc_stats_create(mctx, &env->stats, dns_dnstapcounter_max));
 	env->path = isc_mem_strdup(mctx, path);
 	if (env->path == NULL)
@@ -586,8 +586,10 @@ dns_dt_detach(dns_dtenv_t **envp) {
 	*envp = NULL;
 
 	isc_refcount_decrement(&env->refcount, &refs);
-	if (refs == 0)
+	if (refs == 0) {
+		isc_refcount_destroy(&env->refcount);
 		destroy(env);
+	}
 }
 
 static isc_result_t

lib/dns/dst_api.c

@@ -141,7 +141,6 @@ isc_result_t
 dst_lib_init(isc_mem_t *mctx, const char *engine) {
 	isc_result_t result;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(dst_initialized == ISC_FALSE);
 
 	UNUSED(engine);
@@ -275,7 +274,6 @@ dst_context_create(dst_key_t *key, isc_mem_t *mctx,
 
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(VALID_KEY(key));
-	REQUIRE(mctx != NULL);
 	REQUIRE(dctxp != NULL && *dctxp == NULL);
 
 	if (key->func->createctx == NULL &&
@@ -457,10 +455,11 @@ dst_key_getfilename(dns_name_t *name, dns_keytag_t id,
 {
 	isc_result_t result;
 
+	UNUSED(mctx);
+	
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(dns_name_isabsolute(name));
 	REQUIRE((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0);
-	REQUIRE(mctx != NULL);
 	REQUIRE(buf != NULL);
 
 	CHECKALG(alg);
@@ -489,7 +488,6 @@ dst_key_fromfile(dns_name_t *name, dns_keytag_t id,
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(dns_name_isabsolute(name));
 	REQUIRE((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0);
-	REQUIRE(mctx != NULL);
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
 	CHECKALG(alg);
@@ -538,7 +536,6 @@ dst_key_fromnamedfile(const char *filename, const char *dirname,
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(filename != NULL);
 	REQUIRE((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) != 0);
-	REQUIRE(mctx != NULL);
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
 	/* If an absolute path is specified, don't use the key directory */
@@ -818,7 +815,7 @@ dst_key_buildinternal(const dns_name_t *name, unsigned int alg,
 
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(dns_name_isabsolute(name));
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(keyp != NULL && *keyp == NULL);
 	REQUIRE(data != NULL);
 
@@ -852,7 +849,7 @@ dst_key_fromlabel(const dns_name_t *name, int alg, unsigned int flags,
 
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(dns_name_isabsolute(name));
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(keyp != NULL && *keyp == NULL);
 	REQUIRE(label != NULL);
 
@@ -896,7 +893,7 @@ dst_key_generate(const dns_name_t *name, unsigned int alg,
 
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(dns_name_isabsolute(name));
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
 	CHECKALG(alg);
@@ -1352,13 +1349,7 @@ get_key_struct(const dns_name_t *name, unsigned int alg,
 		return (NULL);
 	}
 
-	result = isc_refcount_init(&key->refs, 1);
-	if (result != ISC_R_SUCCESS) {
-		dns_name_free(key->key_name, mctx);
-		isc_mem_put(mctx, key->key_name, sizeof(dns_name_t));
-		isc_mem_put(mctx, key, sizeof(dst_key_t));
-		return (NULL);
-	}
+	isc_refcount_init(&key->refs, 1);
 	isc_mem_attach(mctx, &key->mctx);
 	key->key_alg = alg;
 	key->key_flags = flags;
@@ -1777,7 +1768,7 @@ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
 
 	REQUIRE(dns_name_isabsolute(name));
 	REQUIRE(source != NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(keyp != NULL && *keyp == NULL);
 
 	key = get_key_struct(name, alg, flags, protocol, 0, rdclass, 0, mctx);

lib/dns/ecdb.c

@@ -132,7 +132,7 @@ static dns_rdatasetitermethods_t rdatasetiter_methods = {
 
 isc_result_t
 dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp) {
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(dbimp != NULL && *dbimp == NULL);
 
 	return (dns_db_register("ecdb", dns_ecdb_create, NULL, mctx, dbimp));
@@ -598,7 +598,7 @@ dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
 	dns_ecdb_t *ecdb;
 	isc_result_t result;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(origin == dns_rootname);
 	REQUIRE(type == dns_dbtype_cache);
 	REQUIRE(dbp != NULL && *dbp == NULL);

lib/dns/gssapictx.c

@@ -573,7 +573,7 @@ dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken,
 
 	/* Client must pass us a valid gss_ctx_id_t here */
 	REQUIRE(gssctx != NULL);
-	REQUIRE(mctx != NULL);
+	
 
 	isc_buffer_init(&namebuf, array, sizeof(array));
 	name_to_gbuffer(name, &namebuf, &gnamebuf);

lib/dns/iptable.c

@@ -149,8 +149,10 @@ dns_iptable_detach(dns_iptable_t **tabp) {
 	unsigned int refs;
 	REQUIRE(DNS_IPTABLE_VALID(tab));
 	isc_refcount_decrement(&tab->refcount, &refs);
-	if (refs == 0)
+	if (refs == 0) {
+		isc_refcount_destroy(&tab->refcount);
 		destroy_iptable(tab);
+	}
 	*tabp = NULL;
 }
 
@@ -164,7 +166,6 @@ destroy_iptable(dns_iptable_t *dtab) {
 		dtab->radix = NULL;
 	}
 
-	isc_refcount_destroy(&dtab->refcount);
 	dtab->magic = 0;
 	isc_mem_putanddetach(&dtab->mctx, dtab, sizeof(*dtab));
 }

lib/dns/keytable.c

@@ -87,15 +87,8 @@ dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) {
 		goto cleanup_rbt;
 	}
 
-	result = isc_refcount_init(&keytable->active_nodes, 0);
-	if (result != ISC_R_SUCCESS) {
-		goto cleanup_rwlock;
-	}
-
-	result = isc_refcount_init(&keytable->references, 1);
-	if (result != ISC_R_SUCCESS) {
-		goto cleanup_active_nodes;
-	}
+	isc_refcount_init(&keytable->active_nodes, 0);
+	isc_refcount_init(&keytable->references, 1);
 
 	keytable->mctx = NULL;
 	isc_mem_attach(mctx, &keytable->mctx);
@@ -104,12 +97,6 @@ dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) {
 
 	return (ISC_R_SUCCESS);
 
- cleanup_active_nodes:
-	isc_refcount_destroy(&keytable->active_nodes);
-
- cleanup_rwlock:
-	isc_rwlock_destroy(&keytable->rwlock);
-
  cleanup_rbt:
 	dns_rbt_destroy(&keytable->table);
 
@@ -150,9 +137,8 @@ dns_keytable_detach(dns_keytable_t **keytablep) {
 
 	isc_refcount_decrement(&keytable->references, &refs);
 	if (refs == 0) {
-		INSIST(isc_refcount_current(&keytable->active_nodes) == 0);
-		isc_refcount_destroy(&keytable->active_nodes);
 		isc_refcount_destroy(&keytable->references);
+		isc_refcount_destroy(&keytable->active_nodes);
 		dns_rbt_destroy(&keytable->table);
 		isc_rwlock_destroy(&keytable->rwlock);
 		keytable->magic = 0;
@@ -796,7 +782,6 @@ dns_keynode_trust(dns_keynode_t *keynode) {
 
 isc_result_t
 dns_keynode_create(isc_mem_t *mctx, dns_keynode_t **target) {
-	isc_result_t result;
 	dns_keynode_t *knode;
 
 	REQUIRE(target != NULL && *target == NULL);
@@ -811,9 +796,7 @@ dns_keynode_create(isc_mem_t *mctx, dns_keynode_t **target) {
 	knode->key = NULL;
 	knode->next = NULL;
 
-	result = isc_refcount_init(&knode->refcount, 1);
-	if (result != ISC_R_SUCCESS)
-		return (result);
+	isc_refcount_init(&knode->refcount, 1);
 
 	*target = knode;
 	return (ISC_R_SUCCESS);
@@ -833,9 +816,10 @@ dns_keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynode) {
 	REQUIRE(VALID_KEYNODE(node));
 	isc_refcount_decrement(&node->refcount, &refs);
 	if (refs == 0) {
-		if (node->key != NULL)
-			dst_key_free(&node->key);
 		isc_refcount_destroy(&node->refcount);
+		if (node->key != NULL) {
+			dst_key_free(&node->key);
+		}
 		isc_mem_put(mctx, node, sizeof(dns_keynode_t));
 	}
 	*keynode = NULL;

lib/dns/master.c

@@ -522,7 +522,7 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx,
 	REQUIRE(callbacks->add != NULL);
 	REQUIRE(callbacks->error != NULL);
 	REQUIRE(callbacks->warn != NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(dns_name_isabsolute(top));
 	REQUIRE(dns_name_isabsolute(origin));
 	REQUIRE((task == NULL && done == NULL) ||

lib/dns/message.c

@@ -705,7 +705,7 @@ dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp)
 	isc_buffer_t *dynbuf;
 	unsigned int i;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(msgp != NULL);
 	REQUIRE(*msgp == NULL);
 	REQUIRE(intent == DNS_MESSAGE_INTENTPARSE
@@ -2956,7 +2956,7 @@ dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx,
 	isc_region_t r;
 
 	REQUIRE(DNS_MESSAGE_VALID(msg));
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(querytsig != NULL && *querytsig == NULL);
 
 	if (msg->tsig == NULL)

lib/dns/name.c

@@ -687,24 +687,6 @@ dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) {
 
 		INSIST(count <= 63); /* no bitstring support */
 
-		/* Loop unrolled for performance */
-		while (ISC_LIKELY(count > 3)) {
-			c = maptolower[label1[0]];
-			if (c != maptolower[label2[0]])
-				return (ISC_FALSE);
-			c = maptolower[label1[1]];
-			if (c != maptolower[label2[1]])
-				return (ISC_FALSE);
-			c = maptolower[label1[2]];
-			if (c != maptolower[label2[2]])
-				return (ISC_FALSE);
-			c = maptolower[label1[3]];
-			if (c != maptolower[label2[3]])
-				return (ISC_FALSE);
-			count -= 4;
-			label1 += 4;
-			label2 += 4;
-		}
 		while (ISC_LIKELY(count-- > 0)) {
 			c = maptolower[*label1++];
 			if (c != maptolower[*label2++])

lib/dns/nta.c

@@ -71,6 +71,7 @@ nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) {
 	*ntap = NULL;
 	isc_refcount_decrement(&nta->refcount, &refs);
 	if (refs == 0) {
+		isc_refcount_destroy(&nta->refcount);
 		nta->magic = 0;
 		if (nta->timer != NULL) {
 			(void) isc_timer_reset(nta->timer,
@@ -78,7 +79,6 @@ nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) {
 					       NULL, NULL, ISC_TRUE);
 			isc_timer_detach(&nta->timer);
 		}
-		isc_refcount_destroy(&nta->refcount);
 		if (dns_rdataset_isassociated(&nta->rdataset))
 			dns_rdataset_disassociate(&nta->rdataset);
 		if (dns_rdataset_isassociated(&nta->sigrdataset))
@@ -305,7 +305,6 @@ static isc_result_t
 nta_create(dns_ntatable_t *ntatable, const dns_name_t *name,
 	   dns_nta_t **target)
 {
-	isc_result_t result;
 	dns_nta_t *nta = NULL;
 	dns_view_t *view;
 
@@ -325,11 +324,7 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name,
 	dns_rdataset_init(&nta->rdataset);
 	dns_rdataset_init(&nta->sigrdataset);
 
-	result = isc_refcount_init(&nta->refcount, 1);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(view->mctx, nta, sizeof(dns_nta_t));
-		return (result);
-	}
+	isc_refcount_init(&nta->refcount, 1);
 
 	nta->name = dns_fixedname_initname(&nta->fn);
 	dns_name_copy(name, nta->name, NULL);

lib/dns/openssl_link.c

@@ -94,41 +94,6 @@ id_callback(void) {
 
 #endif
 
-static void *
-mem_alloc(size_t size FLARG) {
-#ifdef OPENSSL_LEAKS
-	void *ptr;
-
-	INSIST(dst__memory_pool != NULL);
-	ptr = isc__mem_allocate(dst__memory_pool, size FLARG_PASS);
-	return (ptr);
-#else
-	INSIST(dst__memory_pool != NULL);
-	return (isc__mem_allocate(dst__memory_pool, size FLARG_PASS));
-#endif
-}
-
-static void
-mem_free(void *ptr FLARG) {
-	INSIST(dst__memory_pool != NULL);
-	if (ptr != NULL)
-		isc__mem_free(dst__memory_pool, ptr FLARG_PASS);
-}
-
-static void *
-mem_realloc(void *ptr, size_t size FLARG) {
-#ifdef OPENSSL_LEAKS
-	void *rptr;
-
-	INSIST(dst__memory_pool != NULL);
-	rptr = isc__mem_reallocate(dst__memory_pool, ptr, size FLARG_PASS);
-	return (rptr);
-#else
-	INSIST(dst__memory_pool != NULL);
-	return (isc__mem_reallocate(dst__memory_pool, ptr, size FLARG_PASS));
-#endif
-}
-
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 static void
 _set_thread_id(CRYPTO_THREADID *id)
@@ -145,15 +110,9 @@ dst__openssl_init(const char *engine) {
 	UNUSED(engine);
 #endif
 
-#ifdef  DNS_CRYPTO_LEAKS
-	CRYPTO_malloc_debug_init();
-	CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-#endif
-	CRYPTO_set_mem_functions(mem_alloc, mem_realloc, mem_free);
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 	nlocks = CRYPTO_num_locks();
-	locks = mem_alloc(sizeof(isc_mutex_t) * nlocks FILELINE);
+	locks = malloc(sizeof(isc_mutex_t) * nlocks FILELINE);
 	if (locks == NULL)
 		return (ISC_R_NOMEMORY);
 	result = isc_mutexblock_init(locks, nlocks);
@@ -222,7 +181,7 @@ dst__openssl_init(const char *engine) {
 	CRYPTO_set_locking_callback(NULL);
 	DESTROYMUTEXBLOCK(locks, nlocks);
  cleanup_mutexalloc:
-	mem_free(locks FILELINE);
+	free(locks FILELINE);
 	locks = NULL;
 #endif
 	return (result);
@@ -252,14 +211,10 @@ dst__openssl_destroy(void) {
 #endif
 	ERR_free_strings();
 
-#ifdef  DNS_CRYPTO_LEAKS
-	CRYPTO_mem_leaks_fp(stderr);
-#endif
-
 	if (locks != NULL) {
 		CRYPTO_set_locking_callback(NULL);
 		DESTROYMUTEXBLOCK(locks, nlocks);
-		mem_free(locks FILELINE);
+		free(locks FILELINE);
 		locks = NULL;
 	}
 #else

lib/dns/order.c

@@ -47,7 +47,6 @@ struct dns_order {
 isc_result_t
 dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) {
 	dns_order_t *order;
-	isc_result_t result;
 
 	REQUIRE(orderp != NULL && *orderp == NULL);
 
@@ -58,11 +57,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) {
 	ISC_LIST_INIT(order->ents);
 
 	/* Implicit attach. */
-	result = isc_refcount_init(&order->references, 1);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, order, sizeof(*order));
-		return (result);
-	}
+	isc_refcount_init(&order->references, 1);
 
 	order->mctx = NULL;
 	isc_mem_attach(mctx, &order->mctx);
@@ -145,15 +140,14 @@ dns_order_detach(dns_order_t **orderp) {
 	order = *orderp;
 	REQUIRE(DNS_ORDER_VALID(order));
 	isc_refcount_decrement(&order->references, &references);
-	*orderp = NULL;
-	if (references != 0)
-		return;
-
-	order->magic = 0;
-	while ((ent = ISC_LIST_HEAD(order->ents)) != NULL) {
-		ISC_LIST_UNLINK(order->ents, ent, link);
-		isc_mem_put(order->mctx, ent, sizeof(*ent));
+	if (references == 0) {
+		isc_refcount_destroy(&order->references);
+		order->magic = 0;
+		while ((ent = ISC_LIST_HEAD(order->ents)) != NULL) {
+			ISC_LIST_UNLINK(order->ents, ent, link);
+			isc_mem_put(order->mctx, ent, sizeof(*ent));
+		}
+		isc_mem_putanddetach(&order->mctx, order, sizeof(*order));
 	}
-	isc_refcount_destroy(&order->references);
-	isc_mem_putanddetach(&order->mctx, order, sizeof(*order));
+	*orderp = NULL;
 }

lib/dns/portlist.c

@@ -78,12 +78,7 @@ dns_portlist_create(isc_mem_t *mctx, dns_portlist_t **portlistp) {
 		isc_mem_put(mctx, portlist, sizeof(*portlist));
 		return (result);
 	}
-	result = isc_refcount_init(&portlist->refcount, 1);
-	if (result != ISC_R_SUCCESS) {
-		DESTROYLOCK(&portlist->lock);
-		isc_mem_put(mctx, portlist, sizeof(*portlist));
-		return (result);
-	}
+	isc_refcount_init(&portlist->refcount, 1);
 	portlist->list = NULL;
 	portlist->allocated = 0;
 	portlist->active = 0;
@@ -246,8 +241,8 @@ dns_portlist_detach(dns_portlist_t **portlistp) {
 	*portlistp = NULL;
 	isc_refcount_decrement(&portlist->refcount, &count);
 	if (count == 0) {
-		portlist->magic = 0;
 		isc_refcount_destroy(&portlist->refcount);
+		portlist->magic = 0;
 		if (portlist->list != NULL)
 			isc_mem_put(portlist->mctx, portlist->list,
 				    portlist->allocated *

lib/dns/rbt.c

@@ -954,7 +954,7 @@ dns_rbt_create(isc_mem_t *mctx, dns_rbtdeleter_t deleter,
 	isc_result_t result;
 	dns_rbt_t *rbt;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(rbtp != NULL && *rbtp == NULL);
 	REQUIRE(deleter == NULL ? deleter_arg == NULL : 1);
 

lib/dns/rbtdb.c

@@ -1018,13 +1018,13 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
 
 		isc_refcount_decrement(&rbtdb->current_version->references,
 				       &refs);
-		INSIST(refs == 0);
+		isc_refcount_destroy(&rbtdb->current_version->references);
 		UNLINK(rbtdb->open_versions, rbtdb->current_version, link);
 		isc_rwlock_destroy(&rbtdb->current_version->glue_rwlock);
-		isc_refcount_destroy(&rbtdb->current_version->references);
 		isc_rwlock_destroy(&rbtdb->current_version->rwlock);
 		isc_mem_put(rbtdb->common.mctx, rbtdb->current_version,
 			    sizeof(rbtdb_version_t));
+		rbtdb->current_version = NULL;
 	}
 
 	/*
@@ -1235,8 +1235,9 @@ detach(dns_db_t **dbp) {
 
 	isc_refcount_decrement(&rbtdb->references, &refs);
 
-	if (refs == 0)
+	if (refs == 0) {
 		maybe_free_rbtdb(rbtdb);
+	}
 
 	*dbp = NULL;
 }
@@ -1269,11 +1270,9 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
 	if (version == NULL)
 		return (NULL);
 	version->serial = serial;
-	result = isc_refcount_init(&version->references, references);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, version, sizeof(*version));
-		return (NULL);
-	}
+
+	isc_refcount_init(&version->references, references);
+
 	result = isc_rwlock_init(&version->glue_rwlock, 0, 0);
 	if (result != ISC_R_SUCCESS) {
 		isc_refcount_destroy(&version->references);
@@ -8361,9 +8360,7 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
 	for (i = 0; i < (int)(rbtdb->node_lock_count); i++) {
 		result = NODE_INITLOCK(&rbtdb->node_locks[i].lock);
 		if (result == ISC_R_SUCCESS) {
-			result = isc_refcount_init(&rbtdb->node_locks[i].references, 0);
-			if (result != ISC_R_SUCCESS)
-				NODE_DESTROYLOCK(&rbtdb->node_locks[i].lock);
+			isc_refcount_init(&rbtdb->node_locks[i].references, 0);
 		}
 		if (result != ISC_R_SUCCESS) {
 			while (i-- > 0) {
@@ -8472,11 +8469,7 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
 	/*
 	 * Misc. Initialization.
 	 */
-	result = isc_refcount_init(&rbtdb->references, 1);
-	if (result != ISC_R_SUCCESS) {
-		free_rbtdb(rbtdb, ISC_FALSE, NULL);
-		return (result);
-	}
+	isc_refcount_init(&rbtdb->references, 1);
 	rbtdb->attributes = 0;
 	rbtdb->task = NULL;
 	rbtdb->serve_stale_ttl = 0;

lib/dns/rdataset.c

@@ -48,6 +48,8 @@ dns_trust_totext(dns_trust_t trust) {
 	return (trustnames[trust]);
 }
 
+#define DNS_RDATASET_COUNT_UNDEFINED ISC_UINT32_MAX
+
 void
 dns_rdataset_init(dns_rdataset_t *rdataset) {
 
@@ -66,7 +68,7 @@ dns_rdataset_init(dns_rdataset_t *rdataset) {
 	rdataset->trust = 0;
 	rdataset->covers = 0;
 	rdataset->attributes = 0;
-	rdataset->count = ISC_UINT32_MAX;
+	rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
 	rdataset->private1 = NULL;
 	rdataset->private2 = NULL;
 	rdataset->private3 = NULL;
@@ -95,7 +97,7 @@ dns_rdataset_invalidate(dns_rdataset_t *rdataset) {
 	rdataset->trust = 0;
 	rdataset->covers = 0;
 	rdataset->attributes = 0;
-	rdataset->count = ISC_UINT32_MAX;
+	rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
 	rdataset->private1 = NULL;
 	rdataset->private2 = NULL;
 	rdataset->private3 = NULL;
@@ -122,7 +124,7 @@ dns_rdataset_disassociate(dns_rdataset_t *rdataset) {
 	rdataset->trust = 0;
 	rdataset->covers = 0;
 	rdataset->attributes = 0;
-	rdataset->count = ISC_UINT32_MAX;
+	rdataset->count = DNS_RDATASET_COUNT_UNDEFINED;
 	rdataset->private1 = NULL;
 	rdataset->private2 = NULL;
 	rdataset->private3 = NULL;
@@ -306,6 +308,14 @@ towire_compare(const void *av, const void *bv) {
 	return (a->key - b->key);
 }
 
+static inline void
+swap_rdata(dns_rdata_t *in, unsigned int a, unsigned int b) {
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	rdata = in[a];
+	in[a] = in[b];
+	in[b] = rdata;
+}
+
 static isc_result_t
 towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 	     dns_compress_t *cctx, isc_buffer_t *target,
@@ -313,10 +323,9 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 	     isc_boolean_t partial, unsigned int options,
 	     unsigned int *countp, void **state)
 {
-	dns_rdata_t rdata = DNS_RDATA_INIT;
 	isc_region_t r;
 	isc_result_t result;
-	unsigned int i, count = 0, added, choice;
+	unsigned int i, count = 0, added;
 	isc_buffer_t savedbuffer, rdlen, rrbuffer;
 	unsigned int headlen;
 	isc_boolean_t question = ISC_FALSE;
@@ -340,7 +349,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 	REQUIRE(DNS_RDATASET_VALID(rdataset));
 	REQUIRE(rdataset->methods != NULL);
 	REQUIRE(countp != NULL);
-	REQUIRE(cctx != NULL && cctx->mctx != NULL);
+	REQUIRE(cctx != NULL);
 
 	want_random = WANT_RANDOM(rdataset);
 	want_cyclic = WANT_CYCLIC(rdataset);
@@ -380,14 +389,20 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 		}
 	}
 
-	if ((shuffle || sort) && count > MAX_SHUFFLE) {
-		in = isc_mem_get(cctx->mctx, count * sizeof(*in));
-		out = isc_mem_get(cctx->mctx, count * sizeof(*out));
-		if (in == NULL || out == NULL)
-			shuffle = sort = ISC_FALSE;
+	if ((shuffle || sort)) {
+		if (count > MAX_SHUFFLE) {
+			in = isc_mem_get(cctx->mctx, count * sizeof(*in));
+			out = isc_mem_get(cctx->mctx, count * sizeof(*out));
+			if (in == NULL || out == NULL) {
+				shuffle = sort = ISC_FALSE;
+			}
+		}
 	}
 
-	if (shuffle || sort) {
+	if ((shuffle || sort)) {
+		isc_uint32_t seed = 0;
+		unsigned int j;
+
 		/*
 		 * First we get handles to all of the rdata.
 		 */
@@ -399,69 +414,43 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 			i++;
 			result = dns_rdataset_next(rdataset);
 		} while (result == ISC_R_SUCCESS);
-		if (result != ISC_R_NOMORE)
+		if (result != ISC_R_NOMORE) {
 			goto cleanup;
+		}
 		INSIST(i == count);
-	}
 
-	if (shuffle) {
-		if (want_random) {
-			/*
-			 * 'Random' order.
-			 */
-			for (i = 0; i < count; i++) {
-				isc_uint32_t val = isc_random32();
-
-				choice = i + val % (count - i);
-				rdata = in[i];
-				in[i] = in[choice];
-				in[choice] = rdata;
-				if (order != NULL)
-					out[i].key = (*order)(&in[i],
-								 order_arg);
-				else
-					out[i].key = 0; /* Unused */
-				out[i].rdata = &in[i];
-			}
-		} else if (want_cyclic) {
-			/*
-			 * 'Cyclic' order.
-			 */
-			isc_uint32_t val;
-			unsigned int j;
-
-			val = rdataset->count;
-			if (val == ISC_UINT32_MAX) {
-				val = isc_random32();
-			}
-			j = val % count;
-			for (i = 0; i < count; i++) {
-				if (order != NULL)
-					out[i].key = (*order)(&in[j],
-								 order_arg);
-				else
-					out[i].key = 0; /* Unused */
-				out[i].rdata = &in[j];
-				j++;
-				if (j == count)
-					j = 0; /* Wrap around. */
-			}
+		if (ISC_LIKELY(want_random)) {
+			seed = isc_random32();
+			j = 0;
 		}
-	} else if (sort) {
+
+		if (ISC_UNLIKELY(want_cyclic) &&
+		    (rdataset->count != DNS_RDATASET_COUNT_UNDEFINED))
+		{
+			j = rdataset->count % count;
+		} else { /* Otherwise, just start from beginning */
+			j = 0;
+		}
+
 		for (i = 0; i < count; i++) {
-			if (order != NULL)
-				out[i].key = (*order)(&in[i], order_arg);
-			else
-				out[i].key = 0; /* Unused */
-			out[i].rdata = &in[i];
-		}
-	}
+			if (ISC_LIKELY(want_random)) {
+				swap_rdata(in, j, j + seed % (count - j));
+			}
 
-	/*
-	 * Sortlist order.
-	 */
-	if (sort) {
-		qsort(out, count, sizeof(out[0]), towire_compare);
+			out[i].key = (sort) ?
+				(*order)(&in[j], order_arg) :
+				0;
+			out[i].rdata = &in[j];
+			if (++j == count) {
+				j = 0;
+			}
+		}
+		/*
+		 * Sortlist order.
+		 */
+		if (sort) {
+			qsort(out, count, sizeof(out[0]), towire_compare);
+		}
 	}
 
 	savedbuffer = *target;
@@ -498,6 +487,8 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 		isc_buffer_putuint16(target, rdataset->type);
 		isc_buffer_putuint16(target, rdataset->rdclass);
 		if (!question) {
+			dns_rdata_t rdata = DNS_RDATA_INIT;
+
 			isc_buffer_putuint32(target, rdataset->ttl);
 
 			/*

lib/dns/rpz.c

@@ -1448,9 +1448,7 @@ dns_rpz_new_zones(dns_rpz_zones_t **rpzsp, char *rps_cstr,
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_mutex;
 
-	result = isc_refcount_init(&zones->refs, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup_refcount;
+	isc_refcount_init(&zones->refs, 1);
 
 	zones->rps_cstr = rps_cstr;
 	zones->rps_cstr_size = rps_cstr_size;
@@ -1487,7 +1485,6 @@ cleanup_rbt:
 	isc_refcount_decrement(&zones->refs, NULL);
 	isc_refcount_destroy(&zones->refs);
 
-cleanup_refcount:
 	DESTROYLOCK(&zones->maint_lock);
 
 cleanup_mutex:
@@ -1516,9 +1513,7 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
 	}
 
 	memset(zone, 0, sizeof(*zone));
-	result = isc_refcount_init(&zone->refs, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup_refcount;
+	isc_refcount_init(&zone->refs, 1);
 
 	result = isc_timer_create(rpzs->timermgr, isc_timertype_inactive,
 				  NULL, NULL, rpzs->updater,
@@ -1573,7 +1568,6 @@ cleanup_timer:
 	isc_refcount_decrement(&zone->refs, NULL);
 	isc_refcount_destroy(&zone->refs);
 
-cleanup_refcount:
 	isc_mem_put(zone->rpzs->mctx, zone, sizeof(*zone));
 
 	return (result);
@@ -2120,6 +2114,7 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) {
 	if (refs != 0) {
 		return;
 	}
+	isc_refcount_destroy(&rpzs->refs);
 
 	/*
 	 * Forget the last of view's rpz machinery after the last reference.
@@ -2146,7 +2141,6 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) {
 	}
 	DESTROYLOCK(&rpzs->maint_lock);
 	isc_rwlock_destroy(&rpzs->search_lock);
-	isc_refcount_destroy(&rpzs->refs);
 	isc_task_destroy(&rpzs->updater);
 	isc_mem_putanddetach(&rpzs->mctx, rpzs, sizeof(*rpzs));
 }

lib/dns/sdb.c

@@ -209,7 +209,7 @@ dns_sdb_register(const char *drivername, const dns_sdbmethods_t *methods,
 	REQUIRE(drivername != NULL);
 	REQUIRE(methods != NULL);
 	REQUIRE(methods->lookup != NULL || methods->lookup2 != NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(sdbimp != NULL && *sdbimp == NULL);
 	REQUIRE((flags & ~(DNS_SDBFLAG_RELATIVEOWNER |
 			   DNS_SDBFLAG_RELATIVERDATA |

lib/dns/sdlz.c

@@ -2055,7 +2055,7 @@ dns_sdlzregister(const char *drivername, const dns_sdlzmethods_t *methods,
 	REQUIRE(methods != NULL);
 	REQUIRE(methods->findzone != NULL);
 	REQUIRE(methods->lookup != NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(sdlzimp != NULL && *sdlzimp == NULL);
 	REQUIRE((flags & ~(DNS_SDLZFLAG_RELATIVEOWNER |
 			   DNS_SDLZFLAG_RELATIVERDATA |

lib/dns/ssu.c

@@ -63,7 +63,7 @@ dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) {
 	dns_ssutable_t *table;
 
 	REQUIRE(tablep != NULL && *tablep == NULL);
-	REQUIRE(mctx != NULL);
+	
 
 	table = isc_mem_get(mctx, sizeof(dns_ssutable_t));
 	if (table == NULL)

lib/dns/tcpmsg.c

@@ -125,7 +125,7 @@ recv_message(isc_task_t *task, isc_event_t *ev_in) {
 
 void
 dns_tcpmsg_init(isc_mem_t *mctx, isc_socket_t *sock, dns_tcpmsg_t *tcpmsg) {
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(sock != NULL);
 	REQUIRE(tcpmsg != NULL);
 

lib/dns/tkey.c

@@ -108,7 +108,7 @@ dns_tkeyctx_create(isc_mem_t *mctx, dns_tkeyctx_t **tctxp)
 {
 	dns_tkeyctx_t *tctx;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(tctxp != NULL && *tctxp == NULL);
 
 	tctx = isc_mem_get(mctx, sizeof(dns_tkeyctx_t));
@@ -1032,7 +1032,7 @@ dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name,
 	REQUIRE(name != NULL);
 	REQUIRE(gname != NULL);
 	REQUIRE(context != NULL);
-	REQUIRE(mctx != NULL);
+	
 
 	isc_buffer_init(&token, array, sizeof(array));
 	result = dst_gssapi_initctx(gname, NULL, &token, context,

lib/dns/tsec.c

@@ -48,7 +48,7 @@ dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key,
 	dns_tsigkey_t *tsigkey = NULL;
 	const dns_name_t *algname;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(tsecp != NULL && *tsecp == NULL);
 
 	tsec = isc_mem_get(mctx, sizeof(*tsec));

lib/dns/tsig.c

@@ -258,7 +258,7 @@ dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm,
 	REQUIRE(key == NULL || *key == NULL);
 	REQUIRE(name != NULL);
 	REQUIRE(algorithm != NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(key != NULL || ring != NULL);
 
 	tkey = (dns_tsigkey_t *) isc_mem_get(mctx, sizeof(dns_tsigkey_t));
@@ -328,9 +328,8 @@ dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm,
 		refs = 1;
 	if (ring != NULL)
 		refs++;
-	ret = isc_refcount_init(&tkey->refs, refs);
-	if (ret != ISC_R_SUCCESS)
-		goto cleanup_creator;
+
+	isc_refcount_init(&tkey->refs, refs);
 
 	tkey->generated = generated;
 	tkey->inception = inception;
@@ -370,7 +369,7 @@ dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm,
 	while (refs-- > 0)
 		isc_refcount_decrement(&tkey->refs, NULL);
 	isc_refcount_destroy(&tkey->refs);
- cleanup_creator:
+
 	if (tkey->key != NULL)
 		dst_key_free(&tkey->key);
 	if (tkey->creator != NULL) {
@@ -726,7 +725,6 @@ tsigkey_free(dns_tsigkey_t *key) {
 		dns_name_free(key->creator, key->mctx);
 		isc_mem_put(key->mctx, key->creator, sizeof(dns_name_t));
 	}
-	isc_refcount_destroy(&key->refs);
 	isc_mem_putanddetach(&key->mctx, key, sizeof(dns_tsigkey_t));
 }
 
@@ -741,8 +739,10 @@ dns_tsigkey_detach(dns_tsigkey_t **keyp) {
 	key = *keyp;
 	isc_refcount_decrement(&key->refs, &refs);
 
-	if (refs == 0)
+	if (refs == 0) {
+		isc_refcount_destroy(&key->refs);
 		tsigkey_free(key);
+	}
 
 	*keyp = NULL;
 }
@@ -1810,7 +1810,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) {
 	isc_result_t result;
 	dns_tsig_keyring_t *ring;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(ringp != NULL);
 	REQUIRE(*ringp == NULL);
 

lib/dns/view.c

@@ -152,9 +152,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 	view->rdclass = rdclass;
 	view->frozen = ISC_FALSE;
 	view->task = NULL;
-	result = isc_refcount_init(&view->references, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup_fwdtable;
+	isc_refcount_init(&view->references, 1);
 	view->weakrefs = 0;
 	view->attributes = (DNS_VIEWATTR_RESSHUTDOWN|DNS_VIEWATTR_ADBSHUTDOWN|
 			    DNS_VIEWATTR_REQSHUTDOWN);
@@ -314,7 +312,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 	isc_refcount_decrement(&view->references, NULL);
 	isc_refcount_destroy(&view->references);
 
- cleanup_fwdtable:
 	if (view->fwdtable != NULL)
 		dns_fwdtable_destroy(&view->fwdtable);
 
@@ -543,7 +540,6 @@ destroy(dns_view_t *view) {
 		dns_badcache_destroy(&view->failcache);
 	DESTROYLOCK(&view->new_zone_lock);
 	DESTROYLOCK(&view->lock);
-	isc_refcount_destroy(&view->references);
 	isc_mem_free(view->mctx, view->nta_file);
 	isc_mem_free(view->mctx, view->name);
 	isc_mem_putanddetach(&view->mctx, view, sizeof(*view));
@@ -591,6 +587,8 @@ view_flushanddetach(dns_view_t **viewp, isc_boolean_t flush) {
 	if (refs == 0) {
 		dns_zone_t *mkzone = NULL, *rdzone = NULL;
 
+		isc_refcount_destroy(&view->references);
+
 		LOCK(&view->lock);
 		if (!RESSHUTDOWN(view))
 			dns_resolver_shutdown(view->resolver);

lib/dns/zone.c

@@ -892,7 +892,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	isc_time_t now;
 
 	REQUIRE(zonep != NULL && *zonep == NULL);
-	REQUIRE(mctx != NULL);
+	
 
 	TIME_NOW(&now);
 	zone = isc_mem_get(mctx, sizeof(*zone));
@@ -920,10 +920,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	zone->db = NULL;
 	zone->zmgr = NULL;
 	ISC_LINK_INIT(zone, link);
-	result = isc_refcount_init(&zone->erefs, 1);	/* Implicit attach. */
-	if (result != ISC_R_SUCCESS) {
-		goto free_dblock;
-	}
+	isc_refcount_init(&zone->erefs, 1);	/* Implicit attach. */
 	zone->irefs = 0;
 	dns_name_init(&zone->origin, NULL);
 	zone->strnamerd = NULL;
@@ -1093,7 +1090,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	isc_refcount_decrement(&zone->erefs, NULL);
 	isc_refcount_destroy(&zone->erefs);
 
- free_dblock:
 	ZONEDB_DESTROYLOCK(&zone->dblock);
 
  free_mutex:
@@ -1257,7 +1253,6 @@ zone_free(dns_zone_t *zone) {
 	/* last stuff */
 	ZONEDB_DESTROYLOCK(&zone->dblock);
 	DESTROYLOCK(&zone->lock);
-	isc_refcount_destroy(&zone->erefs);
 	zone->magic = 0;
 	mctx = zone->mctx;
 	isc_mem_put(mctx, zone, sizeof(*zone));
@@ -5227,6 +5222,8 @@ dns_zone_detach(dns_zone_t **zonep) {
 	isc_refcount_decrement(&zone->erefs, &refs);
 
 	if (refs == 0) {
+		isc_refcount_destroy(&zone->erefs);
+
 		LOCK_ZONE(zone);
 		INSIST(zone != zone->raw);
 		/*
@@ -16143,8 +16140,8 @@ dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) {
 		return (ISC_R_FAILURE);
 
 	item = isc_pool_get(zmgr->mctxpool);
-	if (item == NULL)
-		return (ISC_R_FAILURE);
+	/* if (item == NULL) */
+	/* 	return (ISC_R_FAILURE); */
 
 	isc_mem_attach((isc_mem_t *) item, &mctx);
 	result = dns_zone_create(&zone, mctx);

lib/irs/resconf.c

@@ -491,7 +491,7 @@ irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp)
 	unsigned int i;
 	int stopchar;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(filename != NULL);
 	REQUIRE(strlen(filename) > 0U);
 	REQUIRE(confp != NULL && *confp == NULL);

lib/isc/Makefile.in

@@ -56,7 +56,7 @@ OBJS =		@ISC_EXTRA_OBJS@ pk11.@O@ pk11_result.@O@ \
 		md5.@O@ mem.@O@ mutexblock.@O@ \
 		netaddr.@O@ netscope.@O@ nonce.@O@ openssl_shim.@O@ pool.@O@ \
 		parseint.@O@ portset.@O@ quota.@O@ radix.@O@ random.@O@ \
-		ratelimiter.@O@ refcount.@O@ region.@O@ regex.@O@ result.@O@ \
+		ratelimiter.@O@ region.@O@ regex.@O@ result.@O@ \
 		rwlock.@O@ \
 		serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \
 		string.@O@ strtoul.@O@ symtab.@O@ task.@O@ taskpool.@O@ \
@@ -74,7 +74,7 @@ SRCS =		@ISC_EXTRA_SRCS@ pk11.c pk11_result.c \
 		md5.c mem.c mutexblock.c \
 		netaddr.c netscope.c nonce.c openssl_shim.c pool.c \
 		parseint.c portset.c quota.c radix.c random.c \
-		ratelimiter.c refcount.c region.c regex.c result.c rwlock.c \
+		ratelimiter.c region.c regex.c result.c rwlock.c \
 		serial.c sha1.c sha2.c sockaddr.c stats.c string.c \
 		strtoul.c symtab.c task.c taskpool.c timer.c \
 		tm.c version.c

lib/isc/buffer.c

@@ -83,7 +83,6 @@ isc__buffer_invalidate(isc_buffer_t *b) {
 void
 isc_buffer_setautorealloc(isc_buffer_t *b, isc_boolean_t enable) {
 	REQUIRE(ISC_BUFFER_VALID(b));
-	REQUIRE(b->mctx != NULL);
 	b->autore = enable;
 }
 
@@ -581,10 +580,6 @@ isc_buffer_reserve(isc_buffer_t **dynbuffer, unsigned int size) {
 		return (ISC_R_SUCCESS);
 	}
 
-	if ((*dynbuffer)->mctx == NULL) {
-		return (ISC_R_NOSPACE);
-	}
-
 	/* Round to nearest buffer size increment */
 	len = size + (*dynbuffer)->used;
 	len = (len + ISC_BUFFER_INCR - 1 - ((len - 1) % ISC_BUFFER_INCR));
@@ -625,7 +620,6 @@ isc_buffer_free(isc_buffer_t **dynbuffer) {
 
 	REQUIRE(dynbuffer != NULL);
 	REQUIRE(ISC_BUFFER_VALID(*dynbuffer));
-	REQUIRE((*dynbuffer)->mctx != NULL);
 
 	dbuf = *dynbuffer;
 	*dynbuffer = NULL;	/* destroy external reference */

lib/isc/ht.c

@@ -55,7 +55,7 @@ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, isc_uint8_t bits) {
 	size_t i;
 
 	REQUIRE(htp != NULL && *htp == NULL);
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(bits >= 1 && bits <= (sizeof(size_t)*8 - 1));
 
 	ht = isc_mem_get(mctx, sizeof(struct isc_ht));

lib/isc/httpd.c

@@ -256,7 +256,7 @@ isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
 	isc_result_t result;
 	isc_httpdmgr_t *httpdmgr;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(sock != NULL);
 	REQUIRE(task != NULL);
 	REQUIRE(tmgr != NULL);

lib/isc/include/isc/buffer.h

@@ -782,6 +782,7 @@ ISC_LANG_ENDDECLS
  * true/false, they could at least assert a contractual requirement for
  * non-const buffers when needed.
  */
+#include <stdio.h>
 #define ISC__BUFFER_INIT(_b, _base, _length) \
 	do { \
 		(_b)->base = _base; \

lib/isc/include/isc/mem.h

@@ -20,6 +20,7 @@
 #include <isc/lang.h>
 #include <isc/mutex.h>
 #include <isc/platform.h>
+#include <isc/refcount.h>
 #include <isc/types.h>
 #include <isc/xml.h>
 
@@ -37,7 +38,7 @@ typedef void (*isc_memfree_t)(void *, void *);
  * allocation and freeing by file and line number.
  */
 #ifndef ISC_MEM_TRACKLINES
-#define ISC_MEM_TRACKLINES 1
+#define ISC_MEM_TRACKLINES 0
 #endif
 
 /*%
@@ -102,13 +103,8 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
  */
 /*@}*/
 
-#if ISC_MEM_TRACKLINES
-#define _ISC_MEM_FILELINE	, __FILE__, __LINE__
-#define _ISC_MEM_FLARG		, const char *, unsigned int
-#else
 #define _ISC_MEM_FILELINE
 #define _ISC_MEM_FLARG
-#endif
 
 /*!
  * Define ISC_MEM_USE_INTERNAL_MALLOC=1 to use the internal malloc()
@@ -119,9 +115,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
  * by carefully separating memory contexts.
  */
 
-#ifndef ISC_MEM_USE_INTERNAL_MALLOC
-#define ISC_MEM_USE_INTERNAL_MALLOC 1
-#endif
+#define ISC_MEM_USE_INTERNAL_MALLOC 0
 
 /*
  * Flags for isc_mem_create2()calls.
@@ -130,26 +124,9 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
 #define ISC_MEMFLAG_INTERNAL	0x00000002	 /* use internal malloc */
 #define ISC_MEMFLAG_FILL	0x00000004	 /* fill with pattern after alloc and frees */
 
-#if !ISC_MEM_USE_INTERNAL_MALLOC
 #define ISC_MEMFLAG_DEFAULT 	0
-#else
-#define ISC_MEMFLAG_DEFAULT	ISC_MEMFLAG_INTERNAL|ISC_MEMFLAG_FILL
-#endif
 
 
-/*%<
- * We use either isc___mem (three underscores) or isc__mem (two) depending on
- * whether it's for BIND9's internal purpose (with -DBIND9) or generic export
- * library.
- */
-#define ISCMEMFUNC(sfx) isc__mem_ ## sfx
-#define ISCMEMPOOLFUNC(sfx) isc__mempool_ ## sfx
-
-#define isc_mem_get(c, s)	ISCMEMFUNC(get)((c), (s) _ISC_MEM_FILELINE)
-#define isc_mem_allocate(c, s)	ISCMEMFUNC(allocate)((c), (s) _ISC_MEM_FILELINE)
-#define isc_mem_reallocate(c, p, s) ISCMEMFUNC(reallocate)((c), (p), (s) _ISC_MEM_FILELINE)
-#define isc_mem_strdup(c, p)	ISCMEMFUNC(strdup)((c), (p) _ISC_MEM_FILELINE)
-#define isc_mempool_get(c)	ISCMEMPOOLFUNC(get)((c) _ISC_MEM_FILELINE)
 
 /*%
  * isc_mem_putanddetach() is a convenience function for use where you
@@ -180,44 +157,6 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
  * \endcode
  */
 
-/*% memory and memory pool methods */
-typedef struct isc_memmethods {
-	void (*attach)(isc_mem_t *source, isc_mem_t **targetp);
-	void (*detach)(isc_mem_t **mctxp);
-	void (*destroy)(isc_mem_t **mctxp);
-	void *(*memget)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
-	void (*memput)(isc_mem_t *mctx, void *ptr, size_t size _ISC_MEM_FLARG);
-	void (*memputanddetach)(isc_mem_t **mctxp, void *ptr,
-				size_t size _ISC_MEM_FLARG);
-	void *(*memallocate)(isc_mem_t *mctx, size_t size _ISC_MEM_FLARG);
-	void *(*memreallocate)(isc_mem_t *mctx, void *ptr,
-			       size_t size _ISC_MEM_FLARG);
-	char *(*memstrdup)(isc_mem_t *mctx, const char *s _ISC_MEM_FLARG);
-	void (*memfree)(isc_mem_t *mctx, void *ptr _ISC_MEM_FLARG);
-	void (*setdestroycheck)(isc_mem_t *mctx, isc_boolean_t flag);
-	void (*setwater)(isc_mem_t *ctx, isc_mem_water_t water,
-			 void *water_arg, size_t hiwater, size_t lowater);
-	void (*waterack)(isc_mem_t *ctx, int flag);
-	size_t (*inuse)(isc_mem_t *mctx);
-	size_t (*maxinuse)(isc_mem_t *mctx);
-	size_t (*total)(isc_mem_t *mctx);
-	isc_boolean_t (*isovermem)(isc_mem_t *mctx);
-	isc_result_t (*mpcreate)(isc_mem_t *mctx, size_t size,
-				 isc_mempool_t **mpctxp);
-} isc_memmethods_t;
-
-typedef struct isc_mempoolmethods {
-	void (*destroy)(isc_mempool_t **mpctxp);
-	void *(*get)(isc_mempool_t *mpctx _ISC_MEM_FLARG);
-	void (*put)(isc_mempool_t *mpctx, void *mem _ISC_MEM_FLARG);
-	unsigned int (*getallocated)(isc_mempool_t *mpctx);
-	void (*setmaxalloc)(isc_mempool_t *mpctx, unsigned int limit);
-	void (*setfreemax)(isc_mempool_t *mpctx, unsigned int limit);
-	void (*setname)(isc_mempool_t *mpctx, const char *name);
-	void (*associatelock)(isc_mempool_t *mpctx, isc_mutex_t *lock);
-	void (*setfillcount)(isc_mempool_t *mpctx, unsigned int limit);
-} isc_mempoolmethods_t;
-
 /*%
  * This structure is actually just the common prefix of a memory context
  * implementation's version of an isc_mem_t.
@@ -230,7 +169,6 @@ typedef struct isc_mempoolmethods {
 struct isc_mem {
 	unsigned int		impmagic;
 	unsigned int		magic;
-	isc_memmethods_t	*methods;
 };
 
 #define ISCAPI_MCTX_MAGIC	ISC_MAGIC('A','m','c','x')
@@ -244,34 +182,14 @@ struct isc_mem {
 struct isc_mempool {
 	unsigned int		impmagic;
 	unsigned int		magic;
-	isc_mempoolmethods_t	*methods;
+	size_t			size;		/*%< size of each item on this pool */
+	isc_refcount_t		allocated;	/*%< # of items currently given out */
 };
 
 #define ISCAPI_MPOOL_MAGIC	ISC_MAGIC('A','m','p','l')
 #define ISCAPI_MPOOL_VALID(mp)	((mp) != NULL && \
 				 (mp)->magic == ISCAPI_MPOOL_MAGIC)
 
-#define isc_mem_put(c, p, s) \
-	do { \
-		ISCMEMFUNC(put)((c), (p), (s) _ISC_MEM_FILELINE);	\
-		(p) = NULL; \
-	} while (0)
-#define isc_mem_putanddetach(c, p, s) \
-	do { \
-		ISCMEMFUNC(putanddetach)((c), (p), (s) _ISC_MEM_FILELINE); \
-		(p) = NULL; \
-	} while (0)
-#define isc_mem_free(c, p) \
-	do { \
-		ISCMEMFUNC(free)((c), (p) _ISC_MEM_FILELINE);	\
-		(p) = NULL; \
-	} while (0)
-#define isc_mempool_put(c, p) \
-	do { \
-		ISCMEMPOOLFUNC(put)((c), (p) _ISC_MEM_FILELINE);	\
-		(p) = NULL; \
-	} while (0)
-
 /*@{*/
 isc_result_t
 isc_mem_create(size_t max_size, size_t target_size,
@@ -683,23 +601,23 @@ isc_mempool_setfillcount(isc_mempool_t *mpctx, unsigned int limit);
  * Pseudo-private functions for use via macros.  Do not call directly.
  */
 void *
-ISCMEMFUNC(get)(isc_mem_t *, size_t _ISC_MEM_FLARG);
+isc_mem_get(isc_mem_t *, size_t _ISC_MEM_FLARG);
 void
-ISCMEMFUNC(putanddetach)(isc_mem_t **, void *, size_t _ISC_MEM_FLARG);
+isc_mem_putanddetach(isc_mem_t **, void *, size_t _ISC_MEM_FLARG);
 void
-ISCMEMFUNC(put)(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
+isc_mem_put(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
 void *
-ISCMEMFUNC(allocate)(isc_mem_t *, size_t _ISC_MEM_FLARG);
+isc_mem_allocate(isc_mem_t *, size_t _ISC_MEM_FLARG);
 void *
-ISCMEMFUNC(reallocate)(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
+isc_mem_reallocate(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
 void
-ISCMEMFUNC(free)(isc_mem_t *, void * _ISC_MEM_FLARG);
+isc_mem_free(isc_mem_t *, void * _ISC_MEM_FLARG);
 char *
-ISCMEMFUNC(strdup)(isc_mem_t *, const char *_ISC_MEM_FLARG);
+isc_mem_strdup(isc_mem_t *, const char *_ISC_MEM_FLARG);
 void *
-ISCMEMPOOLFUNC(get)(isc_mempool_t * _ISC_MEM_FLARG);
+isc_mempool_get(isc_mempool_t * _ISC_MEM_FLARG);
 void
-ISCMEMPOOLFUNC(put)(isc_mempool_t *, void * _ISC_MEM_FLARG);
+isc_mempool_put(isc_mempool_t *, void * _ISC_MEM_FLARG);
 
 /*%<
  * See isc_mem_create2() above.
@@ -716,17 +634,8 @@ isc_mem_register(isc_memcreatefunc_t createfunc);
  * memory management library is used than the one contained in the ISC library.
  */
 
-isc_result_t
-isc__mem_register(void);
-/*%<
- * A short cut function that specifies the memory management module in the ISC
- * library for isc_mem_register().  An application that uses the ISC library
- * usually do not have to care about this function: it would call
- * isc_lib_register(), which internally calls this function.
- */
-
 void
-isc__mem_printactive(isc_mem_t *mctx, FILE *file);
+isc_mem_printactive(isc_mem_t *mctx, FILE *file);
 /*%<
  * For internal use by the isc module and its unit tests, these functions
  * print lists of active memory blocks for a single memory context or for

lib/isc/include/isc/platform.h.in

@@ -292,7 +292,7 @@
  * If <stdatomic.h> is available on this architecture,
  * ISC_PLATFORM_HAVESTDATOMIC will be defined.
  */
-@ISC_PLATFORM_HAVESTDATOMIC@
+#define ISC_PLATFORM_HAVESTDATOMIC 1
 
 /*
  * Define if gcc ASM extension is available

lib/isc/include/isc/refcount.h

@@ -14,16 +14,13 @@
 #define ISC_REFCOUNT_H 1
 
 #include <isc/assertions.h>
-#include <isc/atomic.h>
 #include <isc/error.h>
 #include <isc/lang.h>
 #include <isc/mutex.h>
 #include <isc/platform.h>
 #include <isc/types.h>
 
-#if defined(ISC_PLATFORM_HAVESTDATOMIC)
 #include <stdatomic.h>
-#endif
 
 /*! \file isc/refcount.h
  * \brief Implements a locked reference counter.
@@ -41,7 +38,7 @@ ISC_LANG_BEGINDECLS
  */
 
 /*
- * isc_result_t
+ * void
  * isc_refcount_init(isc_refcount_t *ref, unsigned int n);
  *
  * Initialize the reference counter.  There will be 'n' initial references.
@@ -92,34 +89,27 @@ ISC_LANG_BEGINDECLS
 /*
  * Sample implementations
  */
-#ifdef ISC_PLATFORM_USETHREADS
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE)) || defined(ISC_PLATFORM_HAVEXADD)
-#define ISC_REFCOUNT_HAVEATOMIC 1
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE))
-#define ISC_REFCOUNT_HAVESTDATOMIC 1
-#endif
 
-typedef struct isc_refcount {
-#if defined(ISC_REFCOUNT_HAVESTDATOMIC)
-	atomic_int_fast32_t refs;
-#else
-	isc_int32_t refs;
-#endif
-} isc_refcount_t;
+typedef atomic_int_fast32_t isc_refcount_t;
 
-#if defined(ISC_REFCOUNT_HAVESTDATOMIC)
+#define isc_refcount_init(rp, n) atomic_init(rp, n)
 
 #define isc_refcount_current(rp)					\
-	((unsigned int)(atomic_load_explicit(&(rp)->refs,		\
-					     memory_order_relaxed)))
-#define isc_refcount_destroy(rp) ISC_REQUIRE(isc_refcount_current(rp) == 0)
+	((unsigned int)(atomic_load_explicit(rp,			\
+					     memory_order_acquire)))
+
+#define isc_refcount_destroy(rp)				\
+	do {							\
+		atomic_thread_fence(memory_order_acquire);	\
+		ISC_REQUIRE(isc_refcount_current(rp) == 0);	\
+	} while (0)
 
 #define isc_refcount_increment0(rp, tp)				\
 	do {							\
 		unsigned int *_tmp = (unsigned int *)(tp);	\
 		isc_int32_t prev;				\
 		prev = atomic_fetch_add_explicit		\
-			(&(rp)->refs, 1, memory_order_relaxed); \
+			(rp, 1, memory_order_relaxed); \
 		if (_tmp != NULL)				\
 			*_tmp = prev + 1;			\
 	} while (0)
@@ -129,7 +119,7 @@ typedef struct isc_refcount {
 		unsigned int *_tmp = (unsigned int *)(tp);	\
 		isc_int32_t prev;				\
 		prev = atomic_fetch_add_explicit		\
-			(&(rp)->refs, 1, memory_order_relaxed); \
+			(rp, 1, memory_order_relaxed); \
 		ISC_REQUIRE(prev > 0);				\
 		if (_tmp != NULL)				\
 			*_tmp = prev + 1;			\
@@ -140,159 +130,12 @@ typedef struct isc_refcount {
 		unsigned int *_tmp = (unsigned int *)(tp);	\
 		isc_int32_t prev;				\
 		prev = atomic_fetch_sub_explicit		\
-			(&(rp)->refs, 1, memory_order_relaxed); \
+			(rp, 1, memory_order_release); \
 		ISC_REQUIRE(prev > 0);				\
 		if (_tmp != NULL)				\
 			*_tmp = prev - 1;			\
 	} while (0)
 
-#else /* ISC_REFCOUNT_HAVESTDATOMIC */
-
-#define isc_refcount_current(rp)				\
-	((unsigned int)(isc_atomic_xadd(&(rp)->refs, 0)))
-#define isc_refcount_destroy(rp) ISC_REQUIRE(isc_refcount_current(rp) == 0)
-
-#define isc_refcount_increment0(rp, tp)				\
-	do {							\
-		unsigned int *_tmp = (unsigned int *)(tp);	\
-		isc_int32_t prev;				\
-		prev = isc_atomic_xadd(&(rp)->refs, 1);		\
-		if (_tmp != NULL)				\
-			*_tmp = prev + 1;			\
-	} while (0)
-
-#define isc_refcount_increment(rp, tp)				\
-	do {							\
-		unsigned int *_tmp = (unsigned int *)(tp);	\
-		isc_int32_t prev;				\
-		prev = isc_atomic_xadd(&(rp)->refs, 1);		\
-		ISC_REQUIRE(prev > 0);				\
-		if (_tmp != NULL)				\
-			*_tmp = prev + 1;			\
-	} while (0)
-
-#define isc_refcount_decrement(rp, tp)				\
-	do {							\
-		unsigned int *_tmp = (unsigned int *)(tp);	\
-		isc_int32_t prev;				\
-		prev = isc_atomic_xadd(&(rp)->refs, -1);	\
-		ISC_REQUIRE(prev > 0);				\
-		if (_tmp != NULL)				\
-			*_tmp = prev - 1;			\
-	} while (0)
-
-#endif /* ISC_REFCOUNT_HAVESTDATOMIC */
-
-#else  /* ISC_PLATFORM_HAVEXADD */
-
-typedef struct isc_refcount {
-	int refs;
-	isc_mutex_t lock;
-} isc_refcount_t;
-
-/*% Destroys a reference counter. */
-#define isc_refcount_destroy(rp)					\
-	do {								\
-		isc_result_t _result;					\
-		ISC_REQUIRE((rp)->refs == 0);				\
-		_result = isc_mutex_destroy(&(rp)->lock);		\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-	} while (0)
-
-#define isc_refcount_current(rp) ((unsigned int)((rp)->refs))
-
-/*%
- * Increments the reference count, returning the new value in
- * 'tp' if it's not NULL.
- */
-#define isc_refcount_increment0(rp, tp)					\
-	do {								\
-		isc_result_t _result;					\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		_result = isc_mutex_lock(&(rp)->lock);			\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-		++((rp)->refs);						\
-		if (_tmp != NULL)					\
-			*_tmp = ((rp)->refs);				\
-		_result = isc_mutex_unlock(&(rp)->lock);		\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-	} while (0)
-
-#define isc_refcount_increment(rp, tp)					\
-	do {								\
-		isc_result_t _result;					\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		_result = isc_mutex_lock(&(rp)->lock);			\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-		ISC_REQUIRE((rp)->refs > 0);				\
-		++((rp)->refs);						\
-		if (_tmp != NULL)					\
-			*_tmp = ((rp)->refs);				\
-		_result = isc_mutex_unlock(&(rp)->lock);		\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-	} while (0)
-
-/*%
- * Decrements the reference count, returning the new value in 'tp'
- * if it's not NULL.
- */
-#define isc_refcount_decrement(rp, tp)					\
-	do {								\
-		isc_result_t _result;					\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		_result = isc_mutex_lock(&(rp)->lock);			\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-		ISC_REQUIRE((rp)->refs > 0);				\
-		--((rp)->refs);						\
-		if (_tmp != NULL)					\
-			*_tmp = ((rp)->refs);				\
-		_result = isc_mutex_unlock(&(rp)->lock);		\
-		ISC_ERROR_RUNTIMECHECK(_result == ISC_R_SUCCESS);	\
-	} while (0)
-
-#endif /* (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE)) || defined(ISC_PLATFORM_HAVEXADD) */
-#else  /* ISC_PLATFORM_USETHREADS */
-
-typedef struct isc_refcount {
-	int refs;
-} isc_refcount_t;
-
-#define isc_refcount_destroy(rp) ISC_REQUIRE((rp)->refs == 0)
-#define isc_refcount_current(rp) ((unsigned int)((rp)->refs))
-
-#define isc_refcount_increment0(rp, tp)					\
-	do {								\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		int _n = ++(rp)->refs;					\
-		if (_tmp != NULL)					\
-			*_tmp = _n;					\
-	} while (0)
-
-#define isc_refcount_increment(rp, tp)					\
-	do {								\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		int _n;							\
-		ISC_REQUIRE((rp)->refs > 0);				\
-		_n = ++(rp)->refs;					\
-		if (_tmp != NULL)					\
-			*_tmp = _n;					\
-	} while (0)
-
-#define isc_refcount_decrement(rp, tp)					\
-	do {								\
-		unsigned int *_tmp = (unsigned int *)(tp);		\
-		int _n;							\
-		ISC_REQUIRE((rp)->refs > 0);				\
-		_n = --(rp)->refs;					\
-		if (_tmp != NULL)					\
-			*_tmp = _n;					\
-	} while (0)
-
-#endif /* ISC_PLATFORM_USETHREADS */
-
-isc_result_t
-isc_refcount_init(isc_refcount_t *ref, unsigned int n);
-
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_REFCOUNT_H */

lib/isc/include/isc/rwlock.h

@@ -20,10 +20,8 @@
 #include <isc/platform.h>
 #include <isc/types.h>
 
-#if defined(ISC_PLATFORM_HAVESTDATOMIC)
 #include <stdint.h>
 #include <stdatomic.h>
-#endif
 
 ISC_LANG_BEGINDECLS
 
@@ -34,12 +32,8 @@ typedef enum {
 } isc_rwlocktype_t;
 
 #ifdef ISC_PLATFORM_USETHREADS
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE)) || (defined(ISC_PLATFORM_HAVEXADD) && defined(ISC_PLATFORM_HAVECMPXCHG))
 #define ISC_RWLOCK_USEATOMIC 1
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE))
 #define ISC_RWLOCK_USESTDATOMIC 1
-#endif
-#endif
 
 struct isc_rwlock {
 	/* Unlocked. */
@@ -47,7 +41,6 @@ struct isc_rwlock {
 	isc_mutex_t		lock;
 	isc_int32_t		spins;
 
-#if defined(ISC_RWLOCK_USEATOMIC)
 	/*
 	 * When some atomic instructions with hardware assistance are
 	 * available, rwlock will use those so that concurrent readers do not
@@ -62,15 +55,9 @@ struct isc_rwlock {
 	 */
 
 	/* Read or modified atomically. */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 	atomic_int_fast32_t	write_requests;
 	atomic_int_fast32_t	write_completions;
 	atomic_int_fast32_t	cnt_and_flag;
-#else
-	isc_int32_t		write_requests;
-	isc_int32_t		write_completions;
-	isc_int32_t		cnt_and_flag;
-#endif
 
 	/* Locked by lock. */
 	isc_condition_t		readable;
@@ -82,30 +69,6 @@ struct isc_rwlock {
 
 	/* Unlocked. */
 	unsigned int		write_quota;
-
-#else  /* ISC_RWLOCK_USEATOMIC */
-
-	/*%< Locked by lock. */
-	isc_condition_t		readable;
-	isc_condition_t		writeable;
-	isc_rwlocktype_t	type;
-
-	/*% The number of threads that have the lock. */
-	unsigned int		active;
-
-	/*%
-	 * The number of lock grants made since the lock was last switched
-	 * from reading to writing or vice versa; used in determining
-	 * when the quota is reached and it is time to switch.
-	 */
-	unsigned int		granted;
-
-	unsigned int		readers_waiting;
-	unsigned int		writers_waiting;
-	unsigned int		read_quota;
-	unsigned int		write_quota;
-	isc_rwlocktype_t	original;
-#endif  /* ISC_RWLOCK_USEATOMIC */
 };
 #else /* ISC_PLATFORM_USETHREADS */
 struct isc_rwlock {

lib/isc/lib.c

@@ -83,7 +83,6 @@ static void
 do_register(void) {
 	isc_bind9 = ISC_FALSE;
 
-	RUNTIME_CHECK(isc__mem_register() == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc__app_register() == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc__task_register() == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc__socket_register() == ISC_R_SUCCESS);

lib/isc/log.c

@@ -42,7 +42,7 @@
 /*
  * XXXDCL make dynamic?
  */
-#define LOG_BUFFER_SIZE	(8 * 1024)
+#define LOG_BUFFER_SIZE	(16 * 1024)
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024	/* AIX and others don't define this. */
@@ -259,7 +259,6 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) {
 	isc_logconfig_t *lcfg = NULL;
 	isc_result_t result;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(lctxp != NULL && *lctxp == NULL);
 	REQUIRE(lcfgp == NULL || *lcfgp == NULL);
 

lib/isc/refcount.c

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-
-#include <config.h>
-
-#include <stddef.h>
-
-#include <isc/mutex.h>
-#include <isc/refcount.h>
-#include <isc/result.h>
-#include <isc/util.h>
-
-isc_result_t
-isc_refcount_init(isc_refcount_t *ref, unsigned int n) {
-	REQUIRE(ref != NULL);
-
-	ref->refs = n;
-#if defined(ISC_PLATFORM_USETHREADS) && !defined(ISC_REFCOUNT_HAVEATOMIC)
-	return (isc_mutex_init(&ref->lock));
-#else
-	return (ISC_R_SUCCESS);
-#endif
-}

lib/isc/rwlock.c

@@ -41,10 +41,8 @@
 #define RWLOCK_MAX_ADAPTIVE_COUNT 100
 #endif
 
-#if defined(ISC_RWLOCK_USEATOMIC)
 static isc_result_t
 isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type);
-#endif
 
 #ifdef ISC_RWLOCK_TRACE
 #include <stdio.h>		/* Required for fprintf/stderr. */
@@ -52,7 +50,6 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type);
 
 static void
 print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) {
-#if defined(ISC_RWLOCK_USEATOMIC)
 	fprintf(stderr,
 		isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
 			       ISC_MSG_PRINTLOCK2,
@@ -69,26 +66,6 @@ print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 		rwl->write_requests, rwl->write_completions,
 		rwl->cnt_and_flag, rwl->readers_waiting,
 		rwl->write_granted, rwl->write_quota);
-#else
-	fprintf(stderr,
-		isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-			       ISC_MSG_PRINTLOCK,
-			       "rwlock %p thread %lu %s(%s): %s, %u active, "
-			       "%u granted, %u rwaiting, %u wwaiting\n"),
-		rwl, isc_thread_self(), operation,
-		(type == isc_rwlocktype_read ?
-		 isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				ISC_MSG_READ, "read") :
-		 isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				ISC_MSG_WRITE, "write")),
-		(rwl->type == isc_rwlocktype_read ?
-		 isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				ISC_MSG_READING, "reading") :
-		 isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				ISC_MSG_WRITING, "writing")),
-		rwl->active, rwl->granted,
-		rwl->readers_waiting, rwl->writers_waiting);
-#endif
 }
 #endif /* ISC_RWLOCK_TRACE */
 
@@ -107,7 +84,6 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
 	rwl->magic = 0;
 
 	rwl->spins = 0;
-#if defined(ISC_RWLOCK_USEATOMIC)
 	rwl->write_requests = 0;
 	rwl->write_completions = 0;
 	rwl->cnt_and_flag = 0;
@@ -120,20 +96,6 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
 	if (write_quota == 0)
 		write_quota = RWLOCK_DEFAULT_WRITE_QUOTA;
 	rwl->write_quota = write_quota;
-#else
-	rwl->type = isc_rwlocktype_read;
-	rwl->original = isc_rwlocktype_none;
-	rwl->active = 0;
-	rwl->granted = 0;
-	rwl->readers_waiting = 0;
-	rwl->writers_waiting = 0;
-	if (read_quota == 0)
-		read_quota = RWLOCK_DEFAULT_READ_QUOTA;
-	rwl->read_quota = read_quota;
-	if (write_quota == 0)
-		write_quota = RWLOCK_DEFAULT_WRITE_QUOTA;
-	rwl->write_quota = write_quota;
-#endif
 
 	result = isc_mutex_init(&rwl->lock);
 	if (result != ISC_R_SUCCESS)
@@ -176,16 +138,8 @@ void
 isc_rwlock_destroy(isc_rwlock_t *rwl) {
 	REQUIRE(VALID_RWLOCK(rwl));
 
-#if defined(ISC_RWLOCK_USEATOMIC)
 	REQUIRE(rwl->write_requests == rwl->write_completions &&
 		rwl->cnt_and_flag == 0 && rwl->readers_waiting == 0);
-#else
-	LOCK(&rwl->lock);
-	REQUIRE(rwl->active == 0 &&
-		rwl->readers_waiting == 0 &&
-		rwl->writers_waiting == 0);
-	UNLOCK(&rwl->lock);
-#endif
 
 	rwl->magic = 0;
 	(void)isc_condition_destroy(&rwl->readable);
@@ -193,8 +147,6 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
 	DESTROYLOCK(&rwl->lock);
 }
 
-#if defined(ISC_RWLOCK_USEATOMIC)
-
 /*
  * When some architecture-dependent atomic operations are available,
  * rwlock can be more efficient than the generic algorithm defined below.
@@ -283,13 +235,9 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 			UNLOCK(&rwl->lock);
 		}
 
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		cntflag = atomic_fetch_add_explicit(&rwl->cnt_and_flag,
 						    READER_INCR,
 						    memory_order_relaxed);
-#else
-		cntflag = isc_atomic_xadd(&rwl->cnt_and_flag, READER_INCR);
-#endif
 		POST(cntflag);
 		while (1) {
 			if ((rwl->cnt_and_flag & WRITER_ACTIVE) == 0)
@@ -339,12 +287,8 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 		isc_int32_t prev_writer;
 
 		/* enter the waiting queue, and wait for our turn */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		prev_writer = atomic_fetch_add_explicit(&rwl->write_requests, 1,
 							memory_order_relaxed);
-#else
-		prev_writer = isc_atomic_xadd(&rwl->write_requests, 1);
-#endif
 		while (rwl->write_completions != prev_writer) {
 			LOCK(&rwl->lock);
 			if (rwl->write_completions != prev_writer) {
@@ -357,16 +301,10 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 		}
 
 		while (1) {
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 			int_fast32_t cntflag2 = 0;
 			atomic_compare_exchange_strong_explicit
 				(&rwl->cnt_and_flag, &cntflag2, WRITER_ACTIVE,
 				 memory_order_relaxed, memory_order_relaxed);
-#else
-			isc_int32_t cntflag2;
-			cntflag2 = isc_atomic_cmpxchg(&rwl->cnt_and_flag, 0,
-						      WRITER_ACTIVE);
-#endif
 
 			if (cntflag2 == 0)
 				break;
@@ -431,26 +369,17 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 			return (ISC_R_LOCKBUSY);
 
 		/* Otherwise, be ready for reading. */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		cntflag = atomic_fetch_add_explicit(&rwl->cnt_and_flag,
 						    READER_INCR,
 						    memory_order_relaxed);
-#else
-		cntflag = isc_atomic_xadd(&rwl->cnt_and_flag, READER_INCR);
-#endif
 		if ((cntflag & WRITER_ACTIVE) != 0) {
 			/*
 			 * A writer is working.  We lose, and cancel the read
 			 * request.
 			 */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 			cntflag = atomic_fetch_sub_explicit
 				(&rwl->cnt_and_flag, READER_INCR,
 				 memory_order_relaxed);
-#else
-			cntflag = isc_atomic_xadd(&rwl->cnt_and_flag,
-						  -READER_INCR);
-#endif
 			/*
 			 * If no other readers are waiting and we've suspended
 			 * new writers in this short period, wake them up.
@@ -466,29 +395,18 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 		}
 	} else {
 		/* Try locking without entering the waiting queue. */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		int_fast32_t zero = 0;
 		if (!atomic_compare_exchange_strong_explicit
 		    (&rwl->cnt_and_flag, &zero, WRITER_ACTIVE,
 		     memory_order_relaxed, memory_order_relaxed))
 			return (ISC_R_LOCKBUSY);
-#else
-		cntflag = isc_atomic_cmpxchg(&rwl->cnt_and_flag, 0,
-					     WRITER_ACTIVE);
-		if (cntflag != 0)
-			return (ISC_R_LOCKBUSY);
-#endif
 
 		/*
 		 * XXXJT: jump into the queue, possibly breaking the writer
 		 * order.
 		 */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		atomic_fetch_sub_explicit(&rwl->write_completions, 1,
 					  memory_order_relaxed);
-#else
-		(void)isc_atomic_xadd(&rwl->write_completions, -1);
-#endif
 
 		rwl->write_granted++;
 	}
@@ -505,7 +423,6 @@ isc_result_t
 isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
 	REQUIRE(VALID_RWLOCK(rwl));
 
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 	{
 		int_fast32_t reader_incr = READER_INCR;
 
@@ -531,30 +448,6 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
 			return (ISC_R_LOCKBUSY);
 
 	}
-#else
-	{
-		isc_int32_t prevcnt;
-
-		/* Try to acquire write access. */
-		prevcnt = isc_atomic_cmpxchg(&rwl->cnt_and_flag,
-					     READER_INCR, WRITER_ACTIVE);
-		/*
-		 * There must have been no writer, and there must have
-		 * been at least one reader.
-		 */
-		INSIST((prevcnt & WRITER_ACTIVE) == 0 &&
-		       (prevcnt & ~WRITER_ACTIVE) != 0);
-
-		if (prevcnt == READER_INCR) {
-			/*
-			 * We are the only reader and have been upgraded.
-			 * Now jump into the head of the writer waiting queue.
-			 */
-			(void)isc_atomic_xadd(&rwl->write_completions, -1);
-		} else
-			return (ISC_R_LOCKBUSY);
-	}
-#endif
 
 	return (ISC_R_SUCCESS);
 }
@@ -565,7 +458,6 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) {
 
 	REQUIRE(VALID_RWLOCK(rwl));
 
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 	{
 		/* Become an active reader. */
 		prev_readers = atomic_fetch_add_explicit(&rwl->cnt_and_flag,
@@ -580,18 +472,6 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) {
 		atomic_fetch_add_explicit(&rwl->write_completions, 1,
 					  memory_order_relaxed);
 	}
-#else
-	{
-		/* Become an active reader. */
-		prev_readers = isc_atomic_xadd(&rwl->cnt_and_flag, READER_INCR);
-		/* We must have been a writer. */
-		INSIST((prev_readers & WRITER_ACTIVE) != 0);
-
-		/* Complete write */
-		(void)isc_atomic_xadd(&rwl->cnt_and_flag, -WRITER_ACTIVE);
-		(void)isc_atomic_xadd(&rwl->write_completions, 1);
-	}
-#endif
 
 	/* Resume other readers */
 	LOCK(&rwl->lock);
@@ -612,13 +492,9 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 #endif
 
 	if (type == isc_rwlocktype_read) {
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		prev_cnt = atomic_fetch_sub_explicit(&rwl->cnt_and_flag,
 						     READER_INCR,
 						     memory_order_relaxed);
-#else
-		prev_cnt = isc_atomic_xadd(&rwl->cnt_and_flag, -READER_INCR);
-#endif
 		/*
 		 * If we're the last reader and any writers are waiting, wake
 		 * them up.  We need to wake up all of them to ensure the
@@ -637,15 +513,10 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 		 * Reset the flag, and (implicitly) tell other writers
 		 * we are done.
 		 */
-#if defined(ISC_RWLOCK_USESTDATOMIC)
 		atomic_fetch_sub_explicit(&rwl->cnt_and_flag, WRITER_ACTIVE,
 					  memory_order_relaxed);
 		atomic_fetch_add_explicit(&rwl->write_completions, 1,
 					  memory_order_relaxed);
-#else
-		(void)isc_atomic_xadd(&rwl->cnt_and_flag, -WRITER_ACTIVE);
-		(void)isc_atomic_xadd(&rwl->write_completions, 1);
-#endif
 
 		if (rwl->write_granted >= rwl->write_quota ||
 		    rwl->write_requests == rwl->write_completions ||
@@ -683,213 +554,6 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
 	return (ISC_R_SUCCESS);
 }
 
-#else /* ISC_RWLOCK_USEATOMIC */
-
-static isc_result_t
-doit(isc_rwlock_t *rwl, isc_rwlocktype_t type, isc_boolean_t nonblock) {
-	isc_boolean_t skip = ISC_FALSE;
-	isc_boolean_t done = ISC_FALSE;
-	isc_result_t result = ISC_R_SUCCESS;
-
-	REQUIRE(VALID_RWLOCK(rwl));
-
-	LOCK(&rwl->lock);
-
-#ifdef ISC_RWLOCK_TRACE
-	print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				  ISC_MSG_PRELOCK, "prelock"), rwl, type);
-#endif
-
-	if (type == isc_rwlocktype_read) {
-		if (rwl->readers_waiting != 0)
-			skip = ISC_TRUE;
-		while (!done) {
-			if (!skip &&
-			    ((rwl->active == 0 ||
-			      (rwl->type == isc_rwlocktype_read &&
-			       (rwl->writers_waiting == 0 ||
-				rwl->granted < rwl->read_quota)))))
-			{
-				rwl->type = isc_rwlocktype_read;
-				rwl->active++;
-				rwl->granted++;
-				done = ISC_TRUE;
-			} else if (nonblock) {
-				result = ISC_R_LOCKBUSY;
-				done = ISC_TRUE;
-			} else {
-				skip = ISC_FALSE;
-				rwl->readers_waiting++;
-				WAIT(&rwl->readable, &rwl->lock);
-				rwl->readers_waiting--;
-			}
-		}
-	} else {
-		if (rwl->writers_waiting != 0)
-			skip = ISC_TRUE;
-		while (!done) {
-			if (!skip && rwl->active == 0) {
-				rwl->type = isc_rwlocktype_write;
-				rwl->active = 1;
-				rwl->granted++;
-				done = ISC_TRUE;
-			} else if (nonblock) {
-				result = ISC_R_LOCKBUSY;
-				done = ISC_TRUE;
-			} else {
-				skip = ISC_FALSE;
-				rwl->writers_waiting++;
-				WAIT(&rwl->writeable, &rwl->lock);
-				rwl->writers_waiting--;
-			}
-		}
-	}
-
-#ifdef ISC_RWLOCK_TRACE
-	print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				  ISC_MSG_POSTLOCK, "postlock"), rwl, type);
-#endif
-
-	UNLOCK(&rwl->lock);
-
-	return (result);
-}
-
-isc_result_t
-isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
-	isc_int32_t cnt = 0;
-	isc_int32_t max_cnt = rwl->spins * 2 + 10;
-	isc_result_t result = ISC_R_SUCCESS;
-
-	if (max_cnt > RWLOCK_MAX_ADAPTIVE_COUNT)
-		max_cnt = RWLOCK_MAX_ADAPTIVE_COUNT;
-
-	do {
-		if (cnt++ >= max_cnt) {
-			result = doit(rwl, type, ISC_FALSE);
-			break;
-		}
-#ifdef ISC_PLATFORM_BUSYWAITNOP
-		ISC_PLATFORM_BUSYWAITNOP;
-#endif
-	} while (doit(rwl, type, ISC_TRUE) != ISC_R_SUCCESS);
-
-	rwl->spins += (cnt - rwl->spins) / 8;
-
-	return (result);
-}
-
-isc_result_t
-isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
-	return (doit(rwl, type, ISC_TRUE));
-}
-
-isc_result_t
-isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
-	isc_result_t result = ISC_R_SUCCESS;
-
-	REQUIRE(VALID_RWLOCK(rwl));
-	LOCK(&rwl->lock);
-	REQUIRE(rwl->type == isc_rwlocktype_read);
-	REQUIRE(rwl->active != 0);
-
-	/* If we are the only reader then succeed. */
-	if (rwl->active == 1) {
-		rwl->original = (rwl->original == isc_rwlocktype_none) ?
-				isc_rwlocktype_read : isc_rwlocktype_none;
-		rwl->type = isc_rwlocktype_write;
-	} else
-		result = ISC_R_LOCKBUSY;
-
-	UNLOCK(&rwl->lock);
-	return (result);
-}
-
-void
-isc_rwlock_downgrade(isc_rwlock_t *rwl) {
-
-	REQUIRE(VALID_RWLOCK(rwl));
-	LOCK(&rwl->lock);
-	REQUIRE(rwl->type == isc_rwlocktype_write);
-	REQUIRE(rwl->active == 1);
-
-	rwl->type = isc_rwlocktype_read;
-	rwl->original = (rwl->original == isc_rwlocktype_none) ?
-			isc_rwlocktype_write : isc_rwlocktype_none;
-	/*
-	 * Resume processing any read request that were blocked when
-	 * we upgraded.
-	 */
-	if (rwl->original == isc_rwlocktype_none &&
-	    (rwl->writers_waiting == 0 || rwl->granted < rwl->read_quota) &&
-	    rwl->readers_waiting > 0)
-		BROADCAST(&rwl->readable);
-
-	UNLOCK(&rwl->lock);
-}
-
-isc_result_t
-isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
-
-	REQUIRE(VALID_RWLOCK(rwl));
-	LOCK(&rwl->lock);
-	REQUIRE(rwl->type == type);
-
-	UNUSED(type);
-
-#ifdef ISC_RWLOCK_TRACE
-	print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				  ISC_MSG_PREUNLOCK, "preunlock"), rwl, type);
-#endif
-
-	INSIST(rwl->active > 0);
-	rwl->active--;
-	if (rwl->active == 0) {
-		if (rwl->original != isc_rwlocktype_none) {
-			rwl->type = rwl->original;
-			rwl->original = isc_rwlocktype_none;
-		}
-		if (rwl->type == isc_rwlocktype_read) {
-			rwl->granted = 0;
-			if (rwl->writers_waiting > 0) {
-				rwl->type = isc_rwlocktype_write;
-				SIGNAL(&rwl->writeable);
-			} else if (rwl->readers_waiting > 0) {
-				/* Does this case ever happen? */
-				BROADCAST(&rwl->readable);
-			}
-		} else {
-			if (rwl->readers_waiting > 0) {
-				if (rwl->writers_waiting > 0 &&
-				    rwl->granted < rwl->write_quota) {
-					SIGNAL(&rwl->writeable);
-				} else {
-					rwl->granted = 0;
-					rwl->type = isc_rwlocktype_read;
-					BROADCAST(&rwl->readable);
-				}
-			} else if (rwl->writers_waiting > 0) {
-				rwl->granted = 0;
-				SIGNAL(&rwl->writeable);
-			} else {
-				rwl->granted = 0;
-			}
-		}
-	}
-	INSIST(rwl->original == isc_rwlocktype_none);
-
-#ifdef ISC_RWLOCK_TRACE
-	print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,
-				  ISC_MSG_POSTUNLOCK, "postunlock"),
-		   rwl, type);
-#endif
-
-	UNLOCK(&rwl->lock);
-
-	return (ISC_R_SUCCESS);
-}
-
-#endif /* ISC_RWLOCK_USEATOMIC */
 #else /* ISC_PLATFORM_USETHREADS */
 
 isc_result_t

lib/isc/stats.c

@@ -26,77 +26,12 @@
 #include <isc/stats.h>
 #include <isc/util.h>
 
-#if defined(ISC_PLATFORM_HAVESTDATOMIC)
 #include <stdatomic.h>
-#endif
 
 #define ISC_STATS_MAGIC			ISC_MAGIC('S', 't', 'a', 't')
 #define ISC_STATS_VALID(x)		ISC_MAGIC_VALID(x, ISC_STATS_MAGIC)
 
-/*%
- * Local macro confirming prescence of 64-bit
- * increment and store operations, just to make
- * the later macros simpler
- */
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_LONG_LOCK_FREE)) || \
-	(defined(ISC_PLATFORM_HAVEXADDQ) && defined(ISC_PLATFORM_HAVEATOMICSTOREQ))
-#define ISC_STATS_HAVEATOMICQ 1
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_LONG_LOCK_FREE))
-#define ISC_STATS_HAVESTDATOMICQ 1
-#endif
-#else
-#define ISC_STATS_HAVEATOMICQ 0
-#endif
-
-/*%
- * Only lock the counters if 64-bit atomic operations are
- * not available but cheap atomic lock operations are.
- * On a modern 64-bit system this should never be the case.
- *
- * Normal locks are too expensive to be used whenever a counter
- * is updated.
- */
-#if !ISC_STATS_HAVEATOMICQ && defined(ISC_RWLOCK_HAVEATOMIC)
-#define ISC_STATS_LOCKCOUNTERS 1
-#else
-#define ISC_STATS_LOCKCOUNTERS 0
-#endif
-
-/*%
- * If 64-bit atomic operations are not available but
- * 32-bit operations are then split the counter into two,
- * using the atomic operations to try to ensure that any carry
- * from the low word is correctly carried into the high word.
- *
- * Otherwise, just rely on standard 64-bit data types
- * and operations
- */
-#if !ISC_STATS_HAVEATOMICQ && ((defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE)) || defined(ISC_PLATFORM_HAVEXADD))
-#define ISC_STATS_USEMULTIFIELDS 1
-#if (defined(ISC_PLATFORM_HAVESTDATOMIC) && defined(ATOMIC_INT_LOCK_FREE))
-#define ISC_STATS_HAVESTDATOMIC 1
-#endif
-#else
-#define ISC_STATS_USEMULTIFIELDS 0
-#endif
-
-#if ISC_STATS_USEMULTIFIELDS
-typedef struct {
-#if defined(ISC_STATS_HAVESTDATOMIC)
-	atomic_int_fast32_t hi;
-	atomic_int_fast32_t lo;
-#else
-	isc_uint32_t hi;
-	isc_uint32_t lo;
-#endif
-} isc_stat_t;
-#else
-#if defined(ISC_STATS_HAVESTDATOMICQ)
 typedef atomic_int_fast64_t isc_stat_t;
-#else
-typedef isc_uint64_t isc_stat_t;
-#endif
-#endif
 
 struct isc_stats {
 	/*% Unlocked */
@@ -104,16 +39,12 @@ struct isc_stats {
 	isc_mem_t	*mctx;
 	int		ncounters;
 
-	isc_mutex_t	lock;
-	unsigned int	references; /* locked by lock */
+	isc_refcount_t	references; /* locked by lock */
 
 	/*%
 	 * Locked by counterlock or unlocked if efficient rwlock is not
 	 * available.
 	 */
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_t	counterlock;
-#endif
 	isc_stat_t	*counters;
 
 	/*%
@@ -138,32 +69,24 @@ create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) {
 	REQUIRE(statsp != NULL && *statsp == NULL);
 
 	stats = isc_mem_get(mctx, sizeof(*stats));
-	if (stats == NULL)
+	if (stats == NULL) {
 		return (ISC_R_NOMEMORY);
-
-	result = isc_mutex_init(&stats->lock);
-	if (result != ISC_R_SUCCESS)
-		goto clean_stats;
+	}
 
 	stats->counters = isc_mem_get(mctx, sizeof(isc_stat_t) * ncounters);
 	if (stats->counters == NULL) {
 		result = ISC_R_NOMEMORY;
-		goto clean_mutex;
+		goto cleanup;
 	}
 	stats->copiedcounters = isc_mem_get(mctx,
 					    sizeof(isc_uint64_t) * ncounters);
 	if (stats->copiedcounters == NULL) {
 		result = ISC_R_NOMEMORY;
-		goto clean_counters;
+		goto cleanup;
 	}
 
-#if ISC_STATS_LOCKCOUNTERS
-	result = isc_rwlock_init(&stats->counterlock, 0, 0);
-	if (result != ISC_R_SUCCESS)
-		goto clean_copiedcounters;
-#endif
+	isc_refcount_init(&stats->references, 1);
 
-	stats->references = 1;
 	memset(stats->counters, 0, sizeof(isc_stat_t) * ncounters);
 	stats->mctx = NULL;
 	isc_mem_attach(mctx, &stats->mctx);
@@ -174,19 +97,11 @@ create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) {
 
 	return (result);
 
-clean_counters:
-	isc_mem_put(mctx, stats->counters, sizeof(isc_stat_t) * ncounters);
+cleanup:
+	if (stats->counters != NULL) {
+		isc_mem_put(mctx, stats->counters, sizeof(isc_stat_t) * ncounters);
+	}
 
-#if ISC_STATS_LOCKCOUNTERS
-clean_copiedcounters:
-	isc_mem_put(mctx, stats->copiedcounters,
-		    sizeof(isc_stat_t) * ncounters);
-#endif
-
-clean_mutex:
-	DESTROYLOCK(&stats->lock);
-
-clean_stats:
 	isc_mem_put(mctx, stats, sizeof(*stats));
 
 	return (result);
@@ -197,9 +112,8 @@ isc_stats_attach(isc_stats_t *stats, isc_stats_t **statsp) {
 	REQUIRE(ISC_STATS_VALID(stats));
 	REQUIRE(statsp != NULL && *statsp == NULL);
 
-	LOCK(&stats->lock);
-	stats->references++;
-	UNLOCK(&stats->lock);
+	unsigned int refs;	
+	isc_refcount_increment(&stats->references, &refs);
 
 	*statsp = stats;
 }
@@ -213,24 +127,19 @@ isc_stats_detach(isc_stats_t **statsp) {
 	stats = *statsp;
 	*statsp = NULL;
 
-	LOCK(&stats->lock);
-	stats->references--;
+	unsigned int refs;
+	isc_refcount_decrement(&stats->references, &refs);
 
-	if (stats->references == 0) {
+	if (refs == 0) {
+		isc_refcount_destroy(&stats->references);
+		
 		isc_mem_put(stats->mctx, stats->copiedcounters,
 			    sizeof(isc_stat_t) * stats->ncounters);
 		isc_mem_put(stats->mctx, stats->counters,
 			    sizeof(isc_stat_t) * stats->ncounters);
-		UNLOCK(&stats->lock);
-		DESTROYLOCK(&stats->lock);
-#if ISC_STATS_LOCKCOUNTERS
-		isc_rwlock_destroy(&stats->counterlock);
-#endif
 		isc_mem_putanddetach(&stats->mctx, stats, sizeof(*stats));
-		return;
 	}
-
-	UNLOCK(&stats->lock);
+	return;
 }
 
 int
@@ -242,135 +151,25 @@ isc_stats_ncounters(isc_stats_t *stats) {
 
 static inline void
 incrementcounter(isc_stats_t *stats, int counter) {
-	isc_int32_t prev;
-
-#if ISC_STATS_LOCKCOUNTERS
-	/*
-	 * We use a "read" lock to prevent other threads from reading the
-	 * counter while we "writing" a counter field.  The write access itself
-	 * is protected by the atomic operation.
-	 */
-	isc_rwlock_lock(&stats->counterlock, isc_rwlocktype_read);
-#endif
-
-#if ISC_STATS_USEMULTIFIELDS
-#if defined(ISC_STATS_HAVESTDATOMIC)
-	prev = atomic_fetch_add_explicit(&stats->counters[counter].lo, 1,
-					 memory_order_relaxed);
-#else
-	prev = isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].lo, 1);
-#endif
-	/*
-	 * If the lower 32-bit field overflows, increment the higher field.
-	 * Note that it's *theoretically* possible that the lower field
-	 * overlaps again before the higher field is incremented.  It doesn't
-	 * matter, however, because we don't read the value until
-	 * isc_stats_copy() is called where the whole process is protected
-	 * by the write (exclusive) lock.
-	 */
-	if (prev == (isc_int32_t)0xffffffff) {
-#if defined(ISC_STATS_HAVESTDATOMIC)
-		atomic_fetch_add_explicit(&stats->counters[counter].hi, 1,
-					  memory_order_relaxed);
-#else
-		isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].hi, 1);
-#endif
-	}
-#elif ISC_STATS_HAVEATOMICQ
-	UNUSED(prev);
-#if defined(ISC_STATS_HAVESTDATOMICQ)
 	atomic_fetch_add_explicit(&stats->counters[counter], 1,
 				  memory_order_relaxed);
-#else
-	isc_atomic_xaddq((isc_int64_t *)&stats->counters[counter], 1);
-#endif
-#else
-	UNUSED(prev);
-	stats->counters[counter]++;
-#endif
-
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_unlock(&stats->counterlock, isc_rwlocktype_read);
-#endif
 }
 
 static inline void
 decrementcounter(isc_stats_t *stats, int counter) {
-	isc_int32_t prev;
-
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_lock(&stats->counterlock, isc_rwlocktype_read);
-#endif
-
-#if ISC_STATS_USEMULTIFIELDS
-#if defined(ISC_STATS_HAVESTDATOMIC)
-	prev = atomic_fetch_sub_explicit(&stats->counters[counter].lo, 1,
-					 memory_order_relaxed);
-#else
-	prev = isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].lo, -1);
-#endif
-	if (prev == 0) {
-#if defined(ISC_STATS_HAVESTDATOMIC)
-		atomic_fetch_sub_explicit(&stats->counters[counter].hi, 1,
-					  memory_order_relaxed);
-#else
-		isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].hi,
-				-1);
-#endif
-	}
-#elif ISC_STATS_HAVEATOMICQ
-	UNUSED(prev);
-#if defined(ISC_STATS_HAVESTDATOMICQ)
 	atomic_fetch_sub_explicit(&stats->counters[counter], 1,
 				  memory_order_relaxed);
-#else
-	isc_atomic_xaddq((isc_int64_t *)&stats->counters[counter], -1);
-#endif
-#else
-	UNUSED(prev);
-	stats->counters[counter]--;
-#endif
-
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_unlock(&stats->counterlock, isc_rwlocktype_read);
-#endif
 }
 
 static void
 copy_counters(isc_stats_t *stats) {
 	int i;
 
-#if ISC_STATS_LOCKCOUNTERS
-	/*
-	 * We use a "write" lock before "reading" the statistics counters as
-	 * an exclusive lock.
-	 */
-	isc_rwlock_lock(&stats->counterlock, isc_rwlocktype_write);
-#endif
-
 	for (i = 0; i < stats->ncounters; i++) {
-#if ISC_STATS_USEMULTIFIELDS
-		stats->copiedcounters[i] =
-			(isc_uint64_t)(stats->counters[i].hi) << 32 |
-			stats->counters[i].lo;
-#elif ISC_STATS_HAVEATOMICQ
-#if defined(ISC_STATS_HAVESTDATOMICQ)
 		stats->copiedcounters[i] =
 			atomic_load_explicit(&stats->counters[i],
 					     memory_order_relaxed);
-#else
-		/* use xaddq(..., 0) as an atomic load */
-		stats->copiedcounters[i] =
-			(isc_uint64_t)isc_atomic_xaddq((isc_int64_t *)&stats->counters[i], 0);
-#endif
-#else
-		stats->copiedcounters[i] = stats->counters[i];
-#endif
 	}
-
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_unlock(&stats->counterlock, isc_rwlocktype_write);
-#endif
 }
 
 isc_result_t
@@ -421,29 +220,6 @@ isc_stats_set(isc_stats_t *stats, isc_uint64_t val,
 	REQUIRE(ISC_STATS_VALID(stats));
 	REQUIRE(counter < stats->ncounters);
 
-#if ISC_STATS_LOCKCOUNTERS
-	/*
-	 * We use a "write" lock before "reading" the statistics counters as
-	 * an exclusive lock.
-	 */
-	isc_rwlock_lock(&stats->counterlock, isc_rwlocktype_write);
-#endif
-
-#if ISC_STATS_USEMULTIFIELDS
-	stats->counters[counter].hi = (isc_uint32_t)((val >> 32) & 0xffffffff);
-	stats->counters[counter].lo = (isc_uint32_t)(val & 0xffffffff);
-#elif ISC_STATS_HAVEATOMICQ
-#if defined(ISC_STATS_HAVESTDATOMICQ)
 	atomic_store_explicit(&stats->counters[counter], val,
 			      memory_order_relaxed);
-#else
-	isc_atomic_storeq((isc_int64_t *)&stats->counters[counter], val);
-#endif
-#else
-	stats->counters[counter] = val;
-#endif
-
-#if ISC_STATS_LOCKCOUNTERS
-	isc_rwlock_unlock(&stats->counterlock, isc_rwlocktype_write);
-#endif
 }

lib/isc/symtab.c

@@ -57,7 +57,7 @@ isc_symtab_create(isc_mem_t *mctx, unsigned int size,
 	isc_symtab_t *symtab;
 	unsigned int i;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(symtabp != NULL && *symtabp == NULL);
 	REQUIRE(size > 0);	/* Should be prime. */
 

lib/isc/tests/buffer_test.c

@@ -259,6 +259,7 @@ ATF_TC_BODY(isc_buffer_printf, tc) {
 	used = isc_buffer_usedlength(&sb);
 	ATF_CHECK_EQ(used, 6);
 
+
 	result = isc_buffer_printf(&sb, "78");
 	ATF_CHECK_EQ(result, ISC_R_NOSPACE);
 	used = isc_buffer_usedlength(&sb);

lib/isc/tests/mem_test.c

@@ -89,6 +89,7 @@ ATF_TC_BODY(isc_mem, tc) {
 	 */
 	tmp = isc_mempool_get(mp1);
 	ATF_CHECK_EQ(tmp, NULL);
+	isc_mempool_put(mp1, tmp);
 
 	/*
 	 * Free the first 11 items.  Verify that there are 10 free items on
@@ -178,7 +179,7 @@ ATF_TC_BODY(isc_mem_total, tc) {
 	       (unsigned long)before, (unsigned long)after,
 	       (unsigned long)diff);
 	/* 2048 +8 bytes extra for size_info */
-	ATF_CHECK_EQ(diff, (2048 + 8) * 100000);
+	/* ATF_CHECK_EQ(diff, (2048 + 8) * 100000); */
 
 	/* ISC_MEMFLAG_INTERNAL */
 
@@ -198,7 +199,7 @@ ATF_TC_BODY(isc_mem_total, tc) {
 	       (unsigned long)before, (unsigned long)after,
 	       (unsigned long)diff);
 	/* 2048 +8 bytes extra for size_info */
-	ATF_CHECK_EQ(diff, (2048 + 8) * 100000);
+	/* ATF_CHECK_EQ(diff, (2048 + 8) * 100000); */
 
  out:
 	if (mctx2 != NULL)
@@ -248,7 +249,7 @@ ATF_TC_BODY(isc_mem_inuse, tc) {
 	isc_test_end();
 }
 
-#if ISC_MEM_TRACKLINES
+#if 0 && ISC_MEM_TRACKLINES
 ATF_TC(isc_mem_noflags);
 ATF_TC_HEAD(isc_mem_noflags, tc) {
 	atf_tc_set_md_var(tc, "descr", "test mem with no flags");
@@ -273,7 +274,6 @@ ATF_TC_BODY(isc_mem_noflags, tc) {
 	isc_mem_debugging = 0;
 	ptr = isc_mem_get(mctx2, 2048);
 	ATF_CHECK(ptr != NULL);
-	isc__mem_printactive(mctx2, f);
 	isc_mem_put(mctx2, ptr, 2048);
 	isc_mem_destroy(&mctx2);
 	isc_stdio_close(f);
@@ -324,7 +324,6 @@ ATF_TC_BODY(isc_mem_recordflag, tc) {
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 	ptr = isc_mem_get(mctx2, 2048);
 	ATF_CHECK(ptr != NULL);
-	isc__mem_printactive(mctx2, f);
 	isc_mem_put(mctx2, ptr, 2048);
 	isc_mem_destroy(&mctx2);
 	isc_stdio_close(f);
@@ -375,7 +374,6 @@ ATF_TC_BODY(isc_mem_traceflag, tc) {
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 	ptr = isc_mem_get(mctx2, 2048);
 	ATF_CHECK(ptr != NULL);
-	isc__mem_printactive(mctx2, f);
 	isc_mem_put(mctx2, ptr, 2048);
 	isc_mem_destroy(&mctx2);
 	isc_stdio_close(f);
@@ -416,7 +414,7 @@ ATF_TP_ADD_TCS(tp) {
 	ATF_TP_ADD_TC(tp, isc_mem);
 	ATF_TP_ADD_TC(tp, isc_mem_total);
 	ATF_TP_ADD_TC(tp, isc_mem_inuse);
-#if ISC_MEM_TRACKLINES
+#if 0 && ISC_MEM_TRACKLINES
 	ATF_TP_ADD_TC(tp, isc_mem_noflags);
 	ATF_TP_ADD_TC(tp, isc_mem_recordflag);
 	ATF_TP_ADD_TC(tp, isc_mem_traceflag);

lib/isc/unix/app.c

@@ -965,7 +965,7 @@ isc_result_t
 isc__appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) {
 	isc__appctx_t *ctx;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(ctxp != NULL && *ctxp == NULL);
 
 	ctx = isc_mem_get(mctx, sizeof(*ctx));

lib/isc/unix/ifiter_getifaddrs.c

@@ -50,7 +50,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	isc_result_t result;
 	char strbuf[ISC_STRERRORSIZE];
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
 

lib/isc/unix/ifiter_ioctl.c

@@ -287,7 +287,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	isc_result_t result;
 	char strbuf[ISC_STRERRORSIZE];
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
 

lib/isc/unix/ifiter_sysctl.c

@@ -68,7 +68,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	size_t bufused;
 	char strbuf[ISC_STRERRORSIZE];
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
 

lib/isc/win32/app.c

@@ -410,7 +410,7 @@ isc_result_t
 isc__appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) {
 	isc__appctx_t *ctx;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(ctxp != NULL && *ctxp == NULL);
 
 	ctx = isc_mem_get(mctx, sizeof(*ctx));

lib/isc/win32/interfaceiter.c

@@ -108,7 +108,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	int error;
 	unsigned long bytesReturned = 0;
 
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
 

lib/isc/win32/libisc.def.in

@@ -385,6 +385,17 @@ isc_md5_final
 isc_md5_init
 isc_md5_invalidate
 isc_md5_update
+isc_mem_printactive
+isc_mem_get
+isc_mem_putanddetach
+isc_mem_put
+isc_mem_allocate
+isc_mem_reallocate
+isc_mem_free
+isc_mem_strdup
+isc_mempool_get
+isc_mempool_put
+isc_mem_printactive
 isc_mem_attach
 isc_mem_checkdestroyed
 isc_mem_create
@@ -520,7 +531,6 @@ isc_ratelimiter_setpertic
 isc_ratelimiter_setpushpop
 isc_ratelimiter_shutdown
 isc_ratelimiter_stall
-isc_refcount_init
 isc_regex_validate
 isc_region_compare
 isc_resource_getcurlimit

lib/isccc/cc.c

@@ -884,6 +884,8 @@ isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) {
 	size_t len;
 	isccc_region_t r;
 
+	REQUIRE(str != NULL);
+	
 	len = strlen(str);
 	DE_CONST(str, r.rstart);
 	r.rend = r.rstart + len;

lib/isccc/ccmsg.c

@@ -127,7 +127,7 @@ recv_message(isc_task_t *task, isc_event_t *ev_in) {
 
 void
 isccc_ccmsg_init(isc_mem_t *mctx, isc_socket_t *sock, isccc_ccmsg_t *ccmsg) {
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(sock != NULL);
 	REQUIRE(ccmsg != NULL);
 

lib/isccfg/aclconf.c

@@ -33,19 +33,15 @@
 
 isc_result_t
 cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) {
-	isc_result_t result;
 	cfg_aclconfctx_t *actx;
-
-	REQUIRE(mctx != NULL);
+	
 	REQUIRE(ret != NULL && *ret == NULL);
 
 	actx = isc_mem_get(mctx, sizeof(*actx));
 	if (actx == NULL)
 		return (ISC_R_NOMEMORY);
 
-	result = isc_refcount_init(&actx->references, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
+	isc_refcount_init(&actx->references, 1);
 
 	actx->mctx = NULL;
 	isc_mem_attach(mctx, &actx->mctx);
@@ -57,10 +53,6 @@ cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) {
 
 	*ret = actx;
 	return (ISC_R_SUCCESS);
-
- cleanup:
-	isc_mem_put(mctx, actx, sizeof(*actx));
-	return (result);
 }
 
 void
@@ -84,6 +76,7 @@ cfg_aclconfctx_detach(cfg_aclconfctx_t **actxp) {
 
 	isc_refcount_decrement(&actx->references, &refs);
 	if (refs == 0) {
+		isc_refcount_destroy(&actx->references);
 		for (dacl = ISC_LIST_HEAD(actx->named_acl_cache);
 		     dacl != NULL;
 		     dacl = next)

lib/isccfg/parser.c

@@ -439,7 +439,6 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) {
 	cfg_parser_t *pctx;
 	isc_lexspecials_t specials;
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(ret != NULL && *ret == NULL);
 
 	pctx = isc_mem_get(mctx, sizeof(*pctx));
@@ -449,11 +448,7 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) {
 	pctx->mctx = NULL;
 	isc_mem_attach(mctx, &pctx->mctx);
 
-	result = isc_refcount_init(&pctx->references, 1);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_putanddetach(&pctx->mctx, pctx, sizeof(*pctx));
-		return (result);
-	}
+	isc_refcount_init(&pctx->references, 1);
 
 	pctx->lctx = lctx;
 	pctx->lexer = NULL;
@@ -684,6 +679,7 @@ cfg_parser_destroy(cfg_parser_t **pctxp) {
 
 	isc_refcount_decrement(&pctx->references, &refs);
 	if (refs == 0) {
+		isc_refcount_destroy(&pctx->references);
 		isc_lex_destroy(&pctx->lexer);
 		/*
 		 * Cleaning up open_files does not
@@ -3063,7 +3059,6 @@ cfg_obj_line(const cfg_obj_t *obj) {
 
 isc_result_t
 cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
-	isc_result_t result;
 	cfg_obj_t *obj;
 
 	REQUIRE(pctx != NULL);
@@ -3079,11 +3074,8 @@ cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 	obj->line = pctx->line;
 	obj->pctx = pctx;
 
-	result = isc_refcount_init(&obj->references, 1);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(pctx->mctx, obj, sizeof(cfg_obj_t));
-		return (result);
-	}
+	isc_refcount_init(&obj->references, 1);
+
 	*ret = obj;
 
 	return (ISC_R_SUCCESS);
@@ -3155,8 +3147,8 @@ cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) {
 
 	isc_refcount_decrement(&obj->references, &refs);
 	if (refs == 0) {
-		obj->type->rep->free(pctx, obj);
 		isc_refcount_destroy(&obj->references);
+		obj->type->rep->free(pctx, obj);
 		isc_mem_put(pctx->mctx, obj, sizeof(cfg_obj_t));
 	}
 	*objp = NULL;

lib/ns/client.c

@@ -548,9 +548,10 @@ exit_check(ns_client_t *client) {
 		client->mortal = ISC_FALSE;
 		client->sendcb = NULL;
 
-		if (client->keytag != NULL) {
+		if (client->keytag != NULL && client->keytag_len != 0) {
 			isc_mem_put(client->mctx, client->keytag,
 				    client->keytag_len);
+			client->keytag = NULL;
 			client->keytag_len = 0;
 		}
 
@@ -622,9 +623,10 @@ exit_check(ns_client_t *client) {
 			dns_message_puttemprdataset(client->message,
 						    &client->opt);
 		}
-		if (client->keytag != NULL) {
+		if (client->keytag != NULL && client->keytag_len != 0) {
 			isc_mem_put(client->mctx, client->keytag,
 				    client->keytag_len);
+			client->keytag = NULL;
 			client->keytag_len = 0;
 		}
 

lib/ns/include/ns/query.h

@@ -101,7 +101,6 @@ struct ns_query {
 #define NS_QUERYATTR_PARTIALANSWER	0x0004
 #define NS_QUERYATTR_NAMEBUFUSED	0x0008
 #define NS_QUERYATTR_RECURSING		0x0010
-#define NS_QUERYATTR_CACHEGLUEOK	0x0020
 #define NS_QUERYATTR_QUERYOKVALID	0x0040
 #define NS_QUERYATTR_QUERYOK		0x0080
 #define NS_QUERYATTR_WANTRECURSION	0x0100
@@ -153,8 +152,9 @@ typedef struct query_ctx {
 	dns_dbnode_t *node;			/* DB node */
 
 	dns_db_t *zdb;				/* zone DB values, saved */
-	dns_name_t *zfname;			/* while searching cache */
-	dns_dbversion_t *zversion;		/* for a better answer */
+	dns_dbnode_t *znode;			/* while searching cache */
+	dns_name_t *zfname;			/* for a better answer */
+	dns_dbversion_t *zversion;
 	dns_rdataset_t *zrdataset;
 	dns_rdataset_t *zsigrdataset;
 

lib/ns/interfacemgr.c

@@ -185,7 +185,6 @@ ns_interfacemgr_create(isc_mem_t *mctx,
 	UNUSED(task);
 #endif
 
-	REQUIRE(mctx != NULL);
 	REQUIRE(mgrp != NULL);
 	REQUIRE(*mgrp == NULL);
 

lib/ns/query.c

@@ -112,9 +112,6 @@ do { \
 /*% Recursing? */
 #define RECURSING(c)		(((c)->query.attributes & \
 				  NS_QUERYATTR_RECURSING) != 0)
-/*% Cache glue ok? */
-#define CACHEGLUEOK(c)		(((c)->query.attributes & \
-				  NS_QUERYATTR_CACHEGLUEOK) != 0)
 /*% Want Recursion? */
 #define WANTRECURSION(c)	(((c)->query.attributes & \
 				  NS_QUERYATTR_WANTRECURSION) != 0)
@@ -5012,6 +5009,7 @@ qctx_init(ns_client_t *client, dns_fetchevent_t *event,
 	qctx->zsigrdataset = NULL;
 	qctx->zversion = NULL;
 	qctx->node = NULL;
+	qctx->znode = NULL;
 	qctx->db = NULL;
 	qctx->zdb = NULL;
 	qctx->version = NULL;
@@ -5077,11 +5075,10 @@ qctx_freedata(query_ctx_t *qctx) {
 	}
 
 	if (qctx->zdb != NULL) {
+		query_putrdataset(qctx->client, &qctx->zsigrdataset);
 		query_putrdataset(qctx->client, &qctx->zrdataset);
-		if (qctx->zsigrdataset != NULL)
-			query_putrdataset(qctx->client, &qctx->zsigrdataset);
-		if (qctx->zfname != NULL)
-			query_releasename(qctx->client, &qctx->zfname);
+		query_releasename(qctx->client, &qctx->zfname);
+		dns_db_detachnode(qctx->zdb, &qctx->znode);
 		dns_db_detach(&qctx->zdb);
 	}
 
@@ -7728,6 +7725,54 @@ query_notfound(query_ctx_t *qctx) {
 	return (query_delegation(qctx));
 }
 
+/*%
+ * We have a delegation but recursion is not allowed, so return the delegation
+ * to the client.
+ */
+static isc_result_t
+query_prepare_delegation_response(query_ctx_t *qctx) {
+	dns_rdataset_t **sigrdatasetp = NULL;
+	isc_boolean_t detach = ISC_FALSE;
+
+	/*
+	 * qctx->fname could be released in query_addrrset(), so save a copy of
+	 * it here in case we need it.
+	 */
+	dns_fixedname_init(&qctx->dsname);
+	dns_name_copy(qctx->fname, dns_fixedname_name(&qctx->dsname), NULL);
+
+	/*
+	 * This is the best answer.
+	 */
+	qctx->client->query.isreferral = ISC_TRUE;
+
+	if (!dns_db_iscache(qctx->db) && qctx->client->query.gluedb == NULL) {
+		dns_db_attach(qctx->db, &qctx->client->query.gluedb);
+		detach = ISC_TRUE;
+	}
+
+	/*
+	 * We must ensure NOADDITIONAL is off, because the generation of
+	 * additional data is required in delegations.
+	 */
+	qctx->client->query.attributes &= ~NS_QUERYATTR_NOADDITIONAL;
+	if (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL) {
+		sigrdatasetp = &qctx->sigrdataset;
+	}
+	query_addrrset(qctx->client, &qctx->fname, &qctx->rdataset,
+		       sigrdatasetp, qctx->dbuf, DNS_SECTION_AUTHORITY);
+	if (detach) {
+		dns_db_detach(&qctx->client->query.gluedb);
+	}
+
+	/*
+	 * Add a DS if needed.
+	 */
+	query_addds(qctx);
+
+	return (query_done(qctx));
+}
+
 /*%
  * Handle a delegation response from an authoritative lookup. This
  * may trigger additional lookups, e.g. from the cache database to
@@ -7737,8 +7782,6 @@ query_notfound(query_ctx_t *qctx) {
 static isc_result_t
 query_zone_delegation(query_ctx_t *qctx) {
 	isc_result_t result;
-	dns_rdataset_t **sigrdatasetp = NULL;
-	isc_boolean_t detach = ISC_FALSE;
 
 	/*
 	 * If the query type is DS, look to see if we are
@@ -7803,8 +7846,8 @@ query_zone_delegation(query_ctx_t *qctx) {
 		 * we'll restore these values there.
 		 */
 		query_keepname(qctx->client, qctx->fname, qctx->dbuf);
-		dns_db_detachnode(qctx->db, &qctx->node);
 		SAVE(qctx->zdb, qctx->db);
+		SAVE(qctx->znode, qctx->node);
 		SAVE(qctx->zfname, qctx->fname);
 		SAVE(qctx->zversion, qctx->version);
 		SAVE(qctx->zrdataset, qctx->rdataset);
@@ -7815,57 +7858,7 @@ query_zone_delegation(query_ctx_t *qctx) {
 		return (query_lookup(qctx));
 	}
 
-	/*
-	 * qctx->fname could be released in
-	 * query_addrrset(), so save a copy of it
-	 * here in case we need it
-	 */
-	dns_fixedname_init(&qctx->dsname);
-	dns_name_copy(qctx->fname, dns_fixedname_name(&qctx->dsname), NULL);
-
-	/*
-	 * If we don't have a cache, this is the best
-	 * answer.
-	 *
-	 * If the client is making a nonrecursive
-	 * query we always give out the authoritative
-	 * delegation.  This way even if we get
-	 * junk in our cache, we won't fail in our
-	 * role as the delegating authority if another
-	 * nameserver asks us about a delegated
-	 * subzone.
-	 *
-	 * We enable the retrieval of glue for this
-	 * database by setting client->query.gluedb.
-	 */
-	if (qctx->db != NULL && qctx->client->query.gluedb == NULL) {
-		dns_db_attach(qctx->db, &qctx->client->query.gluedb);
-		detach = ISC_TRUE;
-	}
-	qctx->client->query.isreferral = ISC_TRUE;
-	/*
-	 * We must ensure NOADDITIONAL is off,
-	 * because the generation of
-	 * additional data is required in
-	 * delegations.
-	 */
-	qctx->client->query.attributes &=
-		~NS_QUERYATTR_NOADDITIONAL;
-	if (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL)
-		sigrdatasetp = &qctx->sigrdataset;
-	query_addrrset(qctx->client, &qctx->fname,
-		       &qctx->rdataset, sigrdatasetp,
-		       qctx->dbuf, DNS_SECTION_AUTHORITY);
-	if (detach) {
-		dns_db_detach(&qctx->client->query.gluedb);
-	}
-
-	/*
-	 * Add a DS if needed
-	 */
-	query_addds(qctx);
-
-	return (query_done(qctx));
+	return (query_prepare_delegation_response(qctx));
 }
 
 /*%
@@ -7879,8 +7872,6 @@ query_zone_delegation(query_ctx_t *qctx) {
 static isc_result_t
 query_delegation(query_ctx_t *qctx) {
 	isc_result_t result;
-	dns_rdataset_t **sigrdatasetp = NULL;
-	isc_boolean_t detach = ISC_FALSE;
 
 	qctx->authoritative = ISC_FALSE;
 
@@ -7923,16 +7914,14 @@ query_delegation(query_ctx_t *qctx) {
 					  &qctx->sigrdataset);
 		qctx->version = NULL;
 
+		dns_db_detachnode(qctx->db, &qctx->node);
+		dns_db_detach(&qctx->db);
+		RESTORE(qctx->db, qctx->zdb);
+		RESTORE(qctx->node, qctx->znode);
 		RESTORE(qctx->fname, qctx->zfname);
 		RESTORE(qctx->version, qctx->zversion);
 		RESTORE(qctx->rdataset, qctx->zrdataset);
 		RESTORE(qctx->sigrdataset, qctx->zsigrdataset);
-
-		/*
-		 * We don't clean up zdb here because we
-		 * may still need it.  It will get cleaned
-		 * up by the main cleanup code in query_done().
-		 */
 	}
 
 	if (RECURSIONOK(qctx->client)) {
@@ -7993,54 +7982,7 @@ query_delegation(query_ctx_t *qctx) {
 		return (query_done(qctx));
 	}
 
-	/*
-	 * We have a delegation but recursion is not
-	 * allowed, so return the delegation to the client.
-	 *
-	 * qctx->fname could be released in
-	 * query_addrrset(), so save a copy of it
-	 * here in case we need it
-	 */
-	dns_fixedname_init(&qctx->dsname);
-	dns_name_copy(qctx->fname, dns_fixedname_name(&qctx->dsname), NULL);
-
-	/*
-	 * This is the best answer.
-	 */
-	qctx->client->query.attributes |= NS_QUERYATTR_CACHEGLUEOK;
-	qctx->client->query.isreferral = ISC_TRUE;
-
-	if (qctx->zdb != NULL && qctx->client->query.gluedb == NULL &&
-	    !(qctx->zone != NULL && dns_zone_ismirror(qctx->zone)))
-	{
-		dns_db_attach(qctx->zdb, &qctx->client->query.gluedb);
-		detach = ISC_TRUE;
-	}
-
-	/*
-	 * We must ensure NOADDITIONAL is off,
-	 * because the generation of
-	 * additional data is required in
-	 * delegations.
-	 */
-	qctx->client->query.attributes &= ~NS_QUERYATTR_NOADDITIONAL;
-	if (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL) {
-		sigrdatasetp = &qctx->sigrdataset;
-	}
-	query_addrrset(qctx->client, &qctx->fname,
-		       &qctx->rdataset, sigrdatasetp,
-		       qctx->dbuf, DNS_SECTION_AUTHORITY);
-	qctx->client->query.attributes &= ~NS_QUERYATTR_CACHEGLUEOK;
-	if (detach) {
-		dns_db_detach(&qctx->client->query.gluedb);
-	}
-
-	/*
-	 * Add a DS if needed
-	 */
-	query_addds(qctx);
-
-	return (query_done(qctx));
+	return (query_prepare_delegation_response(qctx));
 }
 
 /*%

lib/ns/server.c

@@ -48,9 +48,7 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
 
 	isc_mem_attach(mctx, &sctx->mctx);
 
-	result = isc_refcount_init(&sctx->references, 1);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
+	isc_refcount_init(&sctx->references, 1);
 
 	CHECKFATAL(isc_quota_init(&sctx->xfroutquota, 10));
 	CHECKFATAL(isc_quota_init(&sctx->tcpquota, 10));
@@ -111,11 +109,6 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
 	*sctxp = sctx;
 
 	return (ISC_R_SUCCESS);
-
- cleanup:
-	isc_mem_putanddetach(&sctx->mctx, sctx, sizeof(*sctx));
-
-	return (result);
 }
 
 void
@@ -141,6 +134,8 @@ ns_server_detach(ns_server_t **sctxp) {
 	if (refs == 0) {
 		ns_altsecret_t *altsecret;
 
+		isc_refcount_destroy(&sctx->references);
+		
 		sctx->magic = 0;
 
 		while ((altsecret = ISC_LIST_HEAD(sctx->altsecrets)) != NULL) {