remove view->attributes field

it's not necessary to use view attributes to determine whether
the ADB, resolver and requestmgr need to be shut down; checking
whether they're NULL is sufficient.

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index caa921ee8cacc8c0e33ac30c16dcb58aa891a5ce..b525583c897e57dd6fcee6775ebe753b38f96673 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -199,9 +199,8 @@ struct dns_view {
        bool       matchrecursiveonly;
 
        /* Locked by themselves. */
-       isc_refcount_t       references;
-       isc_refcount_t       weakrefs;
-       atomic_uint_fast32_t attributes;
+       isc_refcount_t references;
+       isc_refcount_t weakrefs;
 
        /* Under owner's locking control. */
        ISC_LINK(struct dns_view) link;

diff --git a/lib/dns/view.c b/lib/dns/view.c
index f7a3ac040010734760967952c329445f5775f43e..969b153ea7efed2b542862997a397269728d5712 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -72,13 +72,6 @@
                        goto cleanup;        \
        } while (0)
 
-#define RESSHUTDOWN(v) \
-       ((atomic_load(&(v)->attributes) & DNS_VIEWATTR_RESSHUTDOWN) != 0)
-#define ADBSHUTDOWN(v) \
-       ((atomic_load(&(v)->attributes) & DNS_VIEWATTR_ADBSHUTDOWN) != 0)
-#define REQSHUTDOWN(v) \
-       ((atomic_load(&(v)->attributes) & DNS_VIEWATTR_REQSHUTDOWN) != 0)
-
 #define DNS_VIEW_DELONLYHASH   111
 #define DNS_VIEW_FAILCACHESIZE 1021
 
@@ -147,10 +140,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, const char *name,
                       DNS_EVENT_VIEWREQSHUTDOWN, req_shutdown, view, NULL,
                       NULL, NULL);
 
-       atomic_init(&view->attributes,
-                   (DNS_VIEWATTR_RESSHUTDOWN | DNS_VIEWATTR_ADBSHUTDOWN |
-                    DNS_VIEWATTR_REQSHUTDOWN));
-
        isc_mem_attach(mctx, &view->mctx);
 
        isc_mutex_init(&view->lock);
@@ -261,9 +250,6 @@ destroy(dns_view_t *view) {
        dns_dlzdb_t *dlzdb;
 
        REQUIRE(!ISC_LINK_LINKED(view, link));
-       REQUIRE(RESSHUTDOWN(view));
-       REQUIRE(ADBSHUTDOWN(view));
-       REQUIRE(REQSHUTDOWN(view));
 
        isc_refcount_destroy(&view->references);
        isc_refcount_destroy(&view->weakrefs);
@@ -543,13 +529,13 @@ dns_view_detach(dns_view_t **viewp) {
 
                isc_refcount_destroy(&view->references);
 
-               if (!RESSHUTDOWN(view)) {
+               if (view->resolver != NULL) {
                        dns_resolver_shutdown(view->resolver);
                }
-               if (!ADBSHUTDOWN(view)) {
+               if (view->adb != NULL) {
                        dns_adb_shutdown(view->adb);
                }
-               if (!REQSHUTDOWN(view)) {
+               if (view->requestmgr != NULL) {
                        dns_requestmgr_shutdown(view->requestmgr);
                }
 
@@ -655,7 +641,6 @@ resolver_shutdown(isc_task_t *task, isc_event_t *event) {
 
        isc_event_free(&event);
 
-       atomic_fetch_or(&view->attributes, DNS_VIEWATTR_RESSHUTDOWN);
        dns_view_weakdetach(&view);
 }
 
@@ -671,8 +656,6 @@ adb_shutdown(isc_task_t *task, isc_event_t *event) {
 
        isc_event_free(&event);
 
-       atomic_fetch_or(&view->attributes, DNS_VIEWATTR_ADBSHUTDOWN);
-
        dns_view_weakdetach(&view);
 }
 
@@ -688,8 +671,6 @@ req_shutdown(isc_task_t *task, isc_event_t *event) {
 
        isc_event_free(&event);
 
-       atomic_fetch_or(&view->attributes, DNS_VIEWATTR_REQSHUTDOWN);
-
        dns_view_weakdetach(&view);
 }
 
@@ -732,7 +713,6 @@ dns_view_createresolver(dns_view_t *view, isc_taskmgr_t *taskmgr,
        }
        event = &view->resevent;
        dns_resolver_whenshutdown(view->resolver, view->task, &event);
-       atomic_fetch_and(&view->attributes, ~DNS_VIEWATTR_RESSHUTDOWN);
        isc_refcount_increment(&view->weakrefs);
 
        isc_mem_create(&mctx);
@@ -746,7 +726,6 @@ dns_view_createresolver(dns_view_t *view, isc_taskmgr_t *taskmgr,
        }
        event = &view->adbevent;
        dns_adb_whenshutdown(view->adb, view->task, &event);
-       atomic_fetch_and(&view->attributes, ~DNS_VIEWATTR_ADBSHUTDOWN);
        isc_refcount_increment(&view->weakrefs);
 
        result = dns_requestmgr_create(
@@ -760,7 +739,6 @@ dns_view_createresolver(dns_view_t *view, isc_taskmgr_t *taskmgr,
        }
        event = &view->reqevent;
        dns_requestmgr_whenshutdown(view->requestmgr, view->task, &event);
-       atomic_fetch_and(&view->attributes, ~DNS_VIEWATTR_REQSHUTDOWN);
        isc_refcount_increment(&view->weakrefs);
 
        return (ISC_R_SUCCESS);