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

lib/ns/stats.c: use isc_refcount_t

Browse Source
This commit is contained in:
Ondřej Surý
2019-05-20 17:03:34 +02:00
committed by Witold Kręcicki
parent 0471d1c1ce
commit 81faafd508
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ns/stats.c
View File

@@ -23,6 +23,7 @@
#define NS_STATS_VALID(x) ISC_MAGIC_VALID(x, NS_STATS_MAGIC) #define NS_STATS_VALID(x) ISC_MAGIC_VALID(x, NS_STATS_MAGIC)
struct ns_stats { struct ns_stats {
/*% Unlocked */
unsigned int magic; unsigned int magic;
isc_mem_t *mctx; isc_mem_t *mctx;
isc_stats_t *counters; isc_stats_t *counters;
@@ -50,6 +51,7 @@ ns_stats_detach(ns_stats_t **statsp) {
if (isc_refcount_decrement(&stats->references) == 1) { if (isc_refcount_decrement(&stats->references) == 1) {
isc_stats_detach(&stats->counters); isc_stats_detach(&stats->counters);
isc_refcount_destroy(&stats->references);
isc_mem_putanddetach(&stats->mctx, stats, sizeof(*stats)); isc_mem_putanddetach(&stats->mctx, stats, sizeof(*stats));
} }
} }
@@ -62,15 +64,14 @@ ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp) {
REQUIRE(statsp != NULL && *statsp == NULL); REQUIRE(statsp != NULL && *statsp == NULL);
stats = isc_mem_get(mctx, sizeof(*stats)); stats = isc_mem_get(mctx, sizeof(*stats));
if (stats == NULL)
return (ISC_R_NOMEMORY);
stats->counters = NULL; stats->counters = NULL;
atomic_init(&stats->references, 1);
isc_refcount_init(&stats->references, 1);
result = isc_stats_create(mctx, &stats->counters, ncounters); result = isc_stats_create(mctx, &stats->counters, ncounters);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
goto clean_mutex; goto clean_mem;
}
stats->magic = NS_STATS_MAGIC; stats->magic = NS_STATS_MAGIC;
stats->mctx = NULL; stats->mctx = NULL;
@@ -79,7 +80,7 @@ ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp) {
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
clean_mutex: clean_mem:
isc_mem_put(mctx, stats, sizeof(*stats)); isc_mem_put(mctx, stats, sizeof(*stats));
return (result); return (result);