mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

interfacemgr: use isc_refcount_t for reference counting

Browse Source
This commit is contained in:
Witold Kręcicki
2019-05-16 18:43:06 +02:00
parent 5686c33068
commit c434cc69d7
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ns/include/ns/interfacemgr.h
View File

@@ -68,7 +68,7 @@ struct ns_interface {
unsigned int magic; /*%< Magic number. */ unsigned int magic; /*%< Magic number. */
ns_interfacemgr_t * mgr; /*%< Interface manager. */ ns_interfacemgr_t * mgr; /*%< Interface manager. */
isc_mutex_t lock; isc_mutex_t lock;
int references; /*%< Locked */ isc_refcount_t references;
unsigned int generation; /*%< Generation number. */ unsigned int generation; /*%< Generation number. */
isc_sockaddr_t addr; /*%< Address and port. */ isc_sockaddr_t addr; /*%< Address and port. */
unsigned int flags; /*%< Interface characteristics */ unsigned int flags; /*%< Interface characteristics */

38
lib/ns/interfacemgr.c
View File

@@ -64,7 +64,7 @@
/*% nameserver interface manager structure */ /*% nameserver interface manager structure */
struct ns_interfacemgr { struct ns_interfacemgr {
unsigned int magic; /*%< Magic number. */ unsigned int magic; /*%< Magic number. */
int references; isc_refcount_t references;
isc_mutex_t lock; isc_mutex_t lock;
isc_mem_t * mctx; /*%< Memory context. */ isc_mem_t * mctx; /*%< Memory context. */
ns_server_t * sctx; /*%< Server context. */ ns_server_t * sctx; /*%< Server context. */
@@ -253,9 +253,9 @@ ns_interfacemgr_create(isc_mem_t *mctx,
mgr->task = NULL; mgr->task = NULL;
if (mgr->route != NULL) if (mgr->route != NULL)
isc_task_attach(task, &mgr->task); isc_task_attach(task, &mgr->task);
mgr->references = (mgr->route != NULL) ? 2 : 1; isc_refcount_init(&mgr->references, (mgr->route != NULL) ? 2 : 1);
#else #else
mgr->references = 1; isc_refcount_init(&mgr->references, 1);
#endif #endif
mgr->magic = IFMGR_MAGIC; mgr->magic = IFMGR_MAGIC;
*mgrp = mgr; *mgrp = mgr;
@@ -332,27 +332,18 @@ ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr) {
void void
ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target) { ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target) {
REQUIRE(NS_INTERFACEMGR_VALID(source)); REQUIRE(NS_INTERFACEMGR_VALID(source));
LOCK(&source->lock); INSIST(isc_refcount_increment(&source->references) > 0);
INSIST(source->references > 0);
source->references++;
UNLOCK(&source->lock);
*target = source; *target = source;
} }
void void
ns_interfacemgr_detach(ns_interfacemgr_t **targetp) { ns_interfacemgr_detach(ns_interfacemgr_t **targetp) {
isc_result_t need_destroy = false;
ns_interfacemgr_t *target = *targetp; ns_interfacemgr_t *target = *targetp;
REQUIRE(target != NULL); REQUIRE(target != NULL);
REQUIRE(NS_INTERFACEMGR_VALID(target)); REQUIRE(NS_INTERFACEMGR_VALID(target));
LOCK(&target->lock); if (isc_refcount_decrement(&target->references) == 1) {
REQUIRE(target->references > 0);
target->references--;
if (target->references == 0)
need_destroy = true;
UNLOCK(&target->lock);
if (need_destroy)
ns_interfacemgr_destroy(target); ns_interfacemgr_destroy(target);
}
*targetp = NULL; *targetp = NULL;
} }
@@ -435,7 +426,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
ns_interfacemgr_attach(mgr, &ifp->mgr); ns_interfacemgr_attach(mgr, &ifp->mgr);
ISC_LIST_APPEND(mgr->interfaces, ifp, link); ISC_LIST_APPEND(mgr->interfaces, ifp, link);
ifp->references = 1; isc_refcount_init(&ifp->references, 1);
ifp->magic = IFACE_MAGIC; ifp->magic = IFACE_MAGIC;
*ifpret = ifp; *ifpret = ifp;
@@ -667,27 +658,18 @@ ns_interface_destroy(ns_interface_t *ifp) {
void void
ns_interface_attach(ns_interface_t *source, ns_interface_t **target) { ns_interface_attach(ns_interface_t *source, ns_interface_t **target) {
REQUIRE(NS_INTERFACE_VALID(source)); REQUIRE(NS_INTERFACE_VALID(source));
LOCK(&source->lock); isc_refcount_increment(&source->references);
INSIST(source->references > 0);
source->references++;
UNLOCK(&source->lock);
*target = source; *target = source;
} }
void void
ns_interface_detach(ns_interface_t **targetp) { ns_interface_detach(ns_interface_t **targetp) {
isc_result_t need_destroy = false;
ns_interface_t *target = *targetp; ns_interface_t *target = *targetp;
REQUIRE(target != NULL); REQUIRE(target != NULL);
REQUIRE(NS_INTERFACE_VALID(target)); REQUIRE(NS_INTERFACE_VALID(target));
LOCK(&target->lock); if (isc_refcount_decrement(&target->references) == 1) {
REQUIRE(target->references > 0);
target->references--;
if (target->references == 0)
need_destroy = true;
UNLOCK(&target->lock);
if (need_destroy)
ns_interface_destroy(target); ns_interface_destroy(target);
}
*targetp = NULL; *targetp = NULL;
} }