Part2: don't attach/detach view

bin/named/server.c

@@ -9690,7 +9690,7 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr,
 			    !(view->matchrecursiveonly &&
 			      (message->flags & DNS_MESSAGEFLAG_RD) == 0))
 			{
-				dns_view_attach(view, viewp);
+				*viewp = view; // dns_view_attach(view, viewp);
 				return (ISC_R_SUCCESS);
 			}
 		}

lib/dns/zt.c

@@ -47,7 +47,7 @@ struct dns_zt {
 	struct zt_load_params 	*loadparams;
 	/* Locked by lock. */
 	bool		flush;
-	uint32_t		references;
+	isc_refcount_t		references;
 	unsigned int		loads_pending;
 	dns_rbt_t		*table;
 };
@@ -93,7 +93,7 @@ dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) {
 
 	zt->mctx = NULL;
 	isc_mem_attach(mctx, &zt->mctx);
-	zt->references = 1;
+	isc_refcount_init(&zt->references, 1);
 	zt->flush = false;
 	zt->rdclass = rdclass;
 	zt->magic = ZTMAGIC;
@@ -209,14 +209,8 @@ dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) {
 	REQUIRE(VALID_ZT(zt));
 	REQUIRE(ztp != NULL && *ztp == NULL);
 
-	RWLOCK(&zt->rwlock, isc_rwlocktype_write);
-
-	INSIST(zt->references > 0);
-	zt->references++;
-	INSIST(zt->references != 0);
-
-	RWUNLOCK(&zt->rwlock, isc_rwlocktype_write);
-
+	isc_refcount_increment(&zt->references);
+	
 	*ztp = zt;
 }
 
@@ -244,20 +238,9 @@ zt_flushanddetach(dns_zt_t **ztp, bool need_flush) {
 	REQUIRE(ztp != NULL && VALID_ZT(*ztp));
 
 	zt = *ztp;
-
-	RWLOCK(&zt->rwlock, isc_rwlocktype_write);
-
-	INSIST(zt->references > 0);
-	zt->references--;
-	if (zt->references == 0)
-		destroy = true;
-	if (need_flush)
-		zt->flush = true;
-
-	RWUNLOCK(&zt->rwlock, isc_rwlocktype_write);
-
-	if (destroy)
+	if (isc_refcount_decrement(&zt->references) == 1) {
 		zt_destroy(zt);
+	}
 
 	*ztp = NULL;
 }
@@ -340,15 +323,13 @@ asyncload(dns_zone_t *zone, void *zt_) {
 	isc_result_t result;
 	struct dns_zt *zt = (dns_zt_t*) zt_;
 	REQUIRE(zone != NULL);
-	INSIST(zt->references > 0);
-	zt->references++;
+	isc_refcount_increment(&zt->references);
 	zt->loads_pending++;
 
 	result = dns_zone_asyncload(zone, zt->loadparams->newonly, *zt->loadparams->dl, zt);
 	if (result != ISC_R_SUCCESS) {
-		zt->references--;
+		isc_refcount_decrement(&zt->references);
 		zt->loads_pending--;
-		INSIST(zt->references > 0);
 	}
 	return (ISC_R_SUCCESS);
 }
@@ -548,9 +529,7 @@ doneloading(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) {
 
 	RWLOCK(&zt->rwlock, isc_rwlocktype_write);
 	INSIST(zt->loads_pending != 0);
-	INSIST(zt->references != 0);
-	zt->references--;
-	if (zt->references == 0)
+	if (isc_refcount_decrement(&zt->references) == 1)
 		destroy = true;
 	zt->loads_pending--;
 	if (zt->loads_pending == 0) {

lib/ns/client.c

@@ -462,8 +462,10 @@ exit_check(ns_client_t *client) {
 	 * Keep the view attached until any outstanding updates complete.
 	 */
 	if (client->nupdates == 0 &&
-	    client->newstate == NS_CLIENTSTATE_FREED && client->view != NULL)
-		dns_view_detach(&client->view);
+	    client->newstate == NS_CLIENTSTATE_FREED && client->view != NULL) {
+	    	client->view = NULL;
+		// dns_view_detach(&client->view);
+	}
 
 	if (client->state == NS_CLIENTSTATE_WORKING ||
 	    client->state == NS_CLIENTSTATE_RECURSING)
@@ -893,7 +895,8 @@ ns_client_endrequest(ns_client_t *client) {
 			dns_adb_flush(client->view->adb);
 		}
 #endif
-		dns_view_detach(&client->view);
+//		dns_view_detach(&client->view);
+		client->view = NULL;
 	}
 	if (client->opt != NULL) {
 		INSIST(dns_rdataset_isassociated(client->opt));

lib/ns/query.c

@@ -4973,7 +4973,7 @@ qctx_init(ns_client_t *client, dns_fetchevent_t *event,
 
 	/* Set this first so CCTRACE will work */
 	qctx->client = client;
-	dns_view_attach(client->view, &qctx->view);
+	qctx->view = client->view;
 
 	CCTRACE(ISC_LOG_DEBUG(3), "qctx_init");
 
@@ -5049,7 +5049,6 @@ static void
 qctx_destroy(query_ctx_t *qctx) {
 	CALL_HOOK_NORETURN(NS_QUERY_QCTX_DESTROYED, qctx);
 
-	dns_view_detach(&qctx->view);
 	if (qctx->detach_client) {
 		ns_client_detach(&qctx->client);
 	}