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

Rewrite reference counting in isc_mem to use isc_refcount API

Browse Source
This commit is contained in:
Ondřej Surý
2018-05-24 14:43:25 +02:00
parent 0a7535ac81
commit 93e8ba1b50
1 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/isc/mem.c
View File

@@ -27,6 +27,7 @@
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/msgs.h> #include <isc/msgs.h>
#include <isc/once.h> #include <isc/once.h>
#include <isc/refcount.h>
#include <isc/string.h> #include <isc/string.h>
#include <isc/mutex.h> #include <isc/mutex.h>
#include <isc/print.h> #include <isc/print.h>
@@ -128,7 +129,7 @@ struct isc__mem {
size_t max_size; size_t max_size;
bool checkfree; bool checkfree;
struct stats * stats; struct stats * stats;
unsigned int references; isc_refcount_t references;
char name[16]; char name[16];
void * tag; void * tag;
size_t quota; size_t quota;
@@ -905,7 +906,7 @@ isc_mem_createx2(size_t init_max_size, size_t target_size,
else else
ctx->max_size = init_max_size; ctx->max_size = init_max_size;
ctx->flags = flags; ctx->flags = flags;
ctx->references = 1; isc_refcount_init(&ctx->references, 1);
memset(ctx->name, 0, sizeof(ctx->name)); memset(ctx->name, 0, sizeof(ctx->name));
ctx->tag = NULL; ctx->tag = NULL;
ctx->quota = 0; ctx->quota = 0;
@@ -1048,7 +1049,7 @@ destroy(isc__mem_t *ctx) {
ctx->malloced -= DEBUG_TABLE_COUNT * sizeof(debuglist_t); ctx->malloced -= DEBUG_TABLE_COUNT * sizeof(debuglist_t);
} }
#endif #endif
INSIST(ctx->references == 0); isc_refcount_destroy(&ctx->references);
if (ctx->checkfree) { if (ctx->checkfree) {
for (i = 0; i <= ctx->max_size; i++) { for (i = 0; i <= ctx->max_size; i++) {
@@ -1094,13 +1095,12 @@ destroy(isc__mem_t *ctx) {
void void
isc__mem_attach(isc_mem_t *source0, isc_mem_t **targetp) { isc__mem_attach(isc_mem_t *source0, isc_mem_t **targetp) {
isc__mem_t *source = (isc__mem_t *)source0; isc__mem_t *source = (isc__mem_t *)source0;
int_fast32_t refs;
REQUIRE(VALID_CONTEXT(source)); REQUIRE(VALID_CONTEXT(source));
REQUIRE(targetp != NULL && *targetp == NULL); REQUIRE(targetp != NULL && *targetp == NULL);
MCTXLOCK(source, &source->lock); isc_refcount_increment(&source->references, &refs);
source->references++;
MCTXUNLOCK(source, &source->lock);
*targetp = (isc_mem_t *)source; *targetp = (isc_mem_t *)source;
} }
@@ -1108,21 +1108,17 @@ isc__mem_attach(isc_mem_t *source0, isc_mem_t **targetp) {
void void
isc__mem_detach(isc_mem_t **ctxp) { isc__mem_detach(isc_mem_t **ctxp) {
isc__mem_t *ctx; isc__mem_t *ctx;
bool want_destroy = false; int_fast32_t refs;
REQUIRE(ctxp != NULL); REQUIRE(ctxp != NULL);
ctx = (isc__mem_t *)*ctxp; ctx = (isc__mem_t *)*ctxp;
REQUIRE(VALID_CONTEXT(ctx)); REQUIRE(VALID_CONTEXT(ctx));
MCTXLOCK(ctx, &ctx->lock); isc_refcount_decrement(&ctx->references, &refs);
INSIST(ctx->references > 0);
ctx->references--;
if (ctx->references == 0)
want_destroy = true;
MCTXUNLOCK(ctx, &ctx->lock);
if (want_destroy) if (refs == 0) {
destroy(ctx); destroy(ctx);
}
*ctxp = NULL; *ctxp = NULL;
} }
@@ -1140,9 +1136,9 @@ isc__mem_detach(isc_mem_t **ctxp) {
void void
isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) { isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) {
isc__mem_t *ctx; isc__mem_t *ctx;
bool want_destroy = false;
size_info *si; size_info *si;
size_t oldsize; size_t oldsize;
int_fast32_t refs;
REQUIRE(ctxp != NULL); REQUIRE(ctxp != NULL);
ctx = (isc__mem_t *)*ctxp; ctx = (isc__mem_t *)*ctxp;
@@ -1167,13 +1163,11 @@ isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) {
} }
isc__mem_free((isc_mem_t *)ctx, ptr FLARG_PASS); isc__mem_free((isc_mem_t *)ctx, ptr FLARG_PASS);
MCTXLOCK(ctx, &ctx->lock); isc_refcount_decrement(&ctx->references, &refs);
ctx->references--;
if (ctx->references == 0) if (refs == 0) {
want_destroy = true;
MCTXUNLOCK(ctx, &ctx->lock);
if (want_destroy)
destroy(ctx); destroy(ctx);
}
return; return;
} }
@@ -1188,21 +1182,19 @@ isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) {
mem_putstats(ctx, ptr, size); mem_putstats(ctx, ptr, size);
mem_put(ctx, ptr, size); mem_put(ctx, ptr, size);
} }
INSIST(ctx->references > 0);
ctx->references--;
if (ctx->references == 0)
want_destroy = true;
MCTXUNLOCK(ctx, &ctx->lock); MCTXUNLOCK(ctx, &ctx->lock);
if (want_destroy) isc_refcount_decrement(&ctx->references, &refs);
if (refs == 0) {
destroy(ctx); destroy(ctx);
}
} }
void void
isc__mem_destroy(isc_mem_t **ctxp) { isc__mem_destroy(isc_mem_t **ctxp) {
isc__mem_t *ctx; isc__mem_t *ctx;
int_fast32_t refs;
/* /*
* This routine provides legacy support for callers who use mctxs * This routine provides legacy support for callers who use mctxs
@@ -1213,15 +1205,13 @@ isc__mem_destroy(isc_mem_t **ctxp) {
ctx = (isc__mem_t *)*ctxp; ctx = (isc__mem_t *)*ctxp;
REQUIRE(VALID_CONTEXT(ctx)); REQUIRE(VALID_CONTEXT(ctx));
MCTXLOCK(ctx, &ctx->lock); isc_refcount_decrement(&ctx->references, &refs);
#if ISC_MEM_TRACKLINES #if ISC_MEM_TRACKLINES
if (ctx->references != 1) if (refs >= 1) {
print_active(ctx, stderr); print_active(ctx, stderr);
}
#endif #endif
REQUIRE(ctx->references == 1); isc_refcount_destroy(&ctx->references);
ctx->references--;
MCTXUNLOCK(ctx, &ctx->lock);
destroy(ctx); destroy(ctx);
*ctxp = NULL; *ctxp = NULL;
@@ -2270,10 +2260,10 @@ print_contexts(FILE *file) {
ctx != NULL; ctx != NULL;
ctx = ISC_LIST_NEXT(ctx, link)) ctx = ISC_LIST_NEXT(ctx, link))
{ {
fprintf(file, "context: %p (%s): %u references\n", fprintf(file, "context: %p (%s): %" PRIdFAST32 " references\n",
ctx, ctx,
ctx->name[0] == 0 ? "<unknown>" : ctx->name, ctx->name[0] == 0 ? "<unknown>" : ctx->name,
ctx->references); isc_refcount_current(&ctx->references));
print_active(ctx, file); print_active(ctx, file);
} }
fflush(file); fflush(file);
@@ -2315,15 +2305,7 @@ isc_mem_checkdestroyed(FILE *file) {
unsigned int unsigned int
isc_mem_references(isc_mem_t *ctx0) { isc_mem_references(isc_mem_t *ctx0) {
isc__mem_t *ctx = (isc__mem_t *)ctx0; isc__mem_t *ctx = (isc__mem_t *)ctx0;
unsigned int references; return (isc_refcount_current(&ctx->references));
REQUIRE(VALID_CONTEXT(ctx));
MCTXLOCK(ctx, &ctx->lock);
references = ctx->references;
MCTXUNLOCK(ctx, &ctx->lock);
return (references);
} }
typedef struct summarystat { typedef struct summarystat {
@@ -2370,7 +2352,8 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary,
} }
#endif #endif
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "references")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "references"));
TRY0(xmlTextWriterWriteFormatString(writer, "%d", ctx->references)); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIdFAST32,
isc_refcount_current(&ctx->references)));
TRY0(xmlTextWriterEndElement(writer)); /* references */ TRY0(xmlTextWriterEndElement(writer)); /* references */
summary->total += ctx->total; summary->total += ctx->total;
@@ -2570,7 +2553,7 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) {
json_object_object_add(ctxobj, "name", obj); json_object_object_add(ctxobj, "name", obj);
} }
obj = json_object_new_int64(ctx->references); obj = json_object_new_int64(isc_refcount_current(&ctx->references));
CHECKMEM(obj); CHECKMEM(obj);
json_object_object_add(ctxobj, "references", obj); json_object_object_add(ctxobj, "references", obj);