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

lib/isc/counter.c: use isc_refcount_t

Browse Source
This commit is contained in:
Ondřej Surý
2019-05-20 16:58:08 +02:00
committed by Witold Kręcicki
parent 81550c67da
commit 244ac0601f
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/isc/counter.c
View File

@@ -18,6 +18,7 @@
#include <isc/counter.h> #include <isc/counter.h>
#include <isc/magic.h> #include <isc/magic.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/refcount.h>
#include <isc/util.h> #include <isc/util.h>
#define COUNTER_MAGIC ISC_MAGIC('C', 'n', 't', 'r') #define COUNTER_MAGIC ISC_MAGIC('C', 'n', 't', 'r')
@@ -26,7 +27,7 @@
struct isc_counter { struct isc_counter {
unsigned int magic; unsigned int magic;
isc_mem_t *mctx; isc_mem_t *mctx;
atomic_uint_fast32_t references; isc_refcount_t references;
atomic_uint_fast32_t limit; atomic_uint_fast32_t limit;
atomic_uint_fast32_t used; atomic_uint_fast32_t used;
}; };
@@ -44,7 +45,7 @@ isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) {
counter->mctx = NULL; counter->mctx = NULL;
isc_mem_attach(mctx, &counter->mctx); isc_mem_attach(mctx, &counter->mctx);
atomic_init(&counter->references, 1); isc_refcount_init(&counter->references, 1);
atomic_init(&counter->limit, limit); atomic_init(&counter->limit, limit);
atomic_init(&counter->used, 0); atomic_init(&counter->used, 0);
@@ -55,22 +56,21 @@ isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) {
isc_result_t isc_result_t
isc_counter_increment(isc_counter_t *counter) { isc_counter_increment(isc_counter_t *counter) {
isc_result_t result = ISC_R_SUCCESS; uint32_t used = atomic_fetch_add_relaxed(&counter->used, 1) + 1;
uint32_t limit = atomic_load_acquire(&counter->limit);
uint32_t used = atomic_fetch_add(&counter->used, 1) + 1; if (limit != 0 && used >= limit) {
if (atomic_load(&counter->limit) != 0 && return (ISC_R_QUOTA);
used >= atomic_load(&counter->limit)) {
result = ISC_R_QUOTA;
} }
return (result); return (ISC_R_SUCCESS);
} }
unsigned int unsigned int
isc_counter_used(isc_counter_t *counter) { isc_counter_used(isc_counter_t *counter) {
REQUIRE(VALID_COUNTER(counter)); REQUIRE(VALID_COUNTER(counter));
return (atomic_load(&counter->used)); return (atomic_load_acquire(&counter->used));
} }
void void
@@ -85,7 +85,7 @@ isc_counter_attach(isc_counter_t *source, isc_counter_t **targetp) {
REQUIRE(VALID_COUNTER(source)); REQUIRE(VALID_COUNTER(source));
REQUIRE(targetp != NULL && *targetp == NULL); REQUIRE(targetp != NULL && *targetp == NULL);
INSIST(atomic_fetch_add(&source->references, 1) > 0); isc_refcount_increment(&source->references);
*targetp = source; *targetp = source;
} }
@@ -99,7 +99,6 @@ destroy(isc_counter_t *counter) {
void void
isc_counter_detach(isc_counter_t **counterp) { isc_counter_detach(isc_counter_t **counterp) {
isc_counter_t *counter; isc_counter_t *counter;
uint32_t oldrefs;
REQUIRE(counterp != NULL && *counterp != NULL); REQUIRE(counterp != NULL && *counterp != NULL);
counter = *counterp; counter = *counterp;
@@ -107,10 +106,7 @@ isc_counter_detach(isc_counter_t **counterp) {
*counterp = NULL; *counterp = NULL;
oldrefs = atomic_fetch_sub(&counter->references, 1); if (isc_refcount_decrement(&counter->references) == 1) {
INSIST(oldrefs > 0);
if (oldrefs == 1) {
destroy(counter); destroy(counter);
} }
} }