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

Restore Malloced memory counter as InUse alias + little cleanups

Browse Source 
This restores the Malloced memory counter and it's now always equal to
InUse counter.  This is only for backwards compatibility reason and
there is no separate counter.

The commit also cleanups little things like structure with a single
item (summary.inuse), and shuts up a wrong cppcheck warning (the
notorious NULL check after assignment).
This commit is contained in:
Ondřej Surý
2023-01-19 16:57:18 +01:00
parent 474279e5f1
commit 3d674ccc1d
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/isc/mem.c
View File

@@ -1158,8 +1158,8 @@ isc__mempool_get(isc_mempool_t *restrict mpctx FLARG) {
} }
} }
INSIST(mpctx->items != NULL);
item = mpctx->items; item = mpctx->items;
INSIST(item != NULL);
mpctx->items = item->next; mpctx->items = item->next;
@@ -1311,10 +1311,6 @@ isc_mem_references(isc_mem_t *ctx) {
return (isc_refcount_current(&ctx->references)); return (isc_refcount_current(&ctx->references));
} }
typedef struct summarystat {
uint64_t inuse;
} summarystat_t;
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
#define TRY0(a) \ #define TRY0(a) \
do { \ do { \
@@ -1323,7 +1319,7 @@ typedef struct summarystat {
goto error; \ goto error; \
} while (0) } while (0)
static int static int
xml_renderctx(isc_mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) { xml_renderctx(isc_mem_t *ctx, size_t *inuse, xmlTextWriterPtr writer) {
REQUIRE(VALID_CONTEXT(ctx)); REQUIRE(VALID_CONTEXT(ctx));
int xmlrc; int xmlrc;
@@ -1348,12 +1344,17 @@ xml_renderctx(isc_mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) {
isc_refcount_current(&ctx->references))); isc_refcount_current(&ctx->references)));
TRY0(xmlTextWriterEndElement(writer)); /* references */ TRY0(xmlTextWriterEndElement(writer)); /* references */
summary->inuse += isc_mem_inuse(ctx); *inuse += isc_mem_inuse(ctx);
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse"));
TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "",
(uint64_t)isc_mem_inuse(ctx))); (uint64_t)isc_mem_inuse(ctx)));
TRY0(xmlTextWriterEndElement(writer)); /* inuse */ TRY0(xmlTextWriterEndElement(writer)); /* inuse */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "malloced"));
TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "",
(uint64_t)isc_mem_inuse(ctx)));
TRY0(xmlTextWriterEndElement(writer)); /* malloced */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "pools")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "pools"));
TRY0(xmlTextWriterWriteFormatString(writer, "%u", ctx->poolcnt)); TRY0(xmlTextWriterWriteFormatString(writer, "%u", ctx->poolcnt));
TRY0(xmlTextWriterEndElement(writer)); /* pools */ TRY0(xmlTextWriterEndElement(writer)); /* pools */
@@ -1381,7 +1382,7 @@ error:
int int
isc_mem_renderxml(void *writer0) { isc_mem_renderxml(void *writer0) {
isc_mem_t *ctx; isc_mem_t *ctx;
summarystat_t summary = { 0 }; size_t inuse = 0;
int xmlrc; int xmlrc;
xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0;
@@ -1391,7 +1392,7 @@ isc_mem_renderxml(void *writer0) {
for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL;
ctx = ISC_LIST_NEXT(ctx, link)) ctx = ISC_LIST_NEXT(ctx, link))
{ {
xmlrc = xml_renderctx(ctx, &summary, writer); xmlrc = xml_renderctx(ctx, &inuse, writer);
if (xmlrc < 0) { if (xmlrc < 0) {
UNLOCK(&contextslock); UNLOCK(&contextslock);
goto error; goto error;
@@ -1403,9 +1404,14 @@ isc_mem_renderxml(void *writer0) {
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "summary")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "summary"));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Malloced"));
TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "",
(uint64_t)inuse));
TRY0(xmlTextWriterEndElement(writer)); /* malloced */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse"));
TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "",
summary.inuse)); (uint64_t)inuse));
TRY0(xmlTextWriterEndElement(writer)); /* InUse */ TRY0(xmlTextWriterEndElement(writer)); /* InUse */
TRY0(xmlTextWriterEndElement(writer)); /* summary */ TRY0(xmlTextWriterEndElement(writer)); /* summary */
@@ -1419,9 +1425,8 @@ error:
#define CHECKMEM(m) RUNTIME_CHECK(m != NULL) #define CHECKMEM(m) RUNTIME_CHECK(m != NULL)
static isc_result_t static isc_result_t
json_renderctx(isc_mem_t *ctx, summarystat_t *summary, json_object *array) { json_renderctx(isc_mem_t *ctx, size_t *inuse, json_object *array) {
REQUIRE(VALID_CONTEXT(ctx)); REQUIRE(VALID_CONTEXT(ctx));
REQUIRE(summary != NULL);
REQUIRE(array != NULL); REQUIRE(array != NULL);
json_object *ctxobj, *obj; json_object *ctxobj, *obj;
@@ -1429,7 +1434,7 @@ json_renderctx(isc_mem_t *ctx, summarystat_t *summary, json_object *array) {
MCTXLOCK(ctx); MCTXLOCK(ctx);
summary->inuse += isc_mem_inuse(ctx); *inuse += isc_mem_inuse(ctx);
ctxobj = json_object_new_object(); ctxobj = json_object_new_object();
CHECKMEM(ctxobj); CHECKMEM(ctxobj);
@@ -1449,6 +1454,10 @@ json_renderctx(isc_mem_t *ctx, summarystat_t *summary, json_object *array) {
CHECKMEM(obj); CHECKMEM(obj);
json_object_object_add(ctxobj, "references", obj); json_object_object_add(ctxobj, "references", obj);
obj = json_object_new_int64(isc_mem_inuse(ctx));
CHECKMEM(obj);
json_object_object_add(ctxobj, "malloced", obj);
obj = json_object_new_int64(isc_mem_inuse(ctx)); obj = json_object_new_int64(isc_mem_inuse(ctx));
CHECKMEM(obj); CHECKMEM(obj);
json_object_object_add(ctxobj, "inuse", obj); json_object_object_add(ctxobj, "inuse", obj);
@@ -1474,7 +1483,7 @@ isc_result_t
isc_mem_renderjson(void *memobj0) { isc_mem_renderjson(void *memobj0) {
isc_result_t result = ISC_R_SUCCESS; isc_result_t result = ISC_R_SUCCESS;
isc_mem_t *ctx; isc_mem_t *ctx;
summarystat_t summary = { 0 }; size_t inuse = 0;
json_object *ctxarray, *obj; json_object *ctxarray, *obj;
json_object *memobj = (json_object *)memobj0; json_object *memobj = (json_object *)memobj0;
@@ -1485,7 +1494,7 @@ isc_mem_renderjson(void *memobj0) {
for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL;
ctx = ISC_LIST_NEXT(ctx, link)) ctx = ISC_LIST_NEXT(ctx, link))
{ {
result = json_renderctx(ctx, &summary, ctxarray); result = json_renderctx(ctx, &inuse, ctxarray);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
UNLOCK(&contextslock); UNLOCK(&contextslock);
goto error; goto error;
@@ -1493,10 +1502,14 @@ isc_mem_renderjson(void *memobj0) {
} }
UNLOCK(&contextslock); UNLOCK(&contextslock);
obj = json_object_new_int64(summary.inuse); obj = json_object_new_int64(inuse);
CHECKMEM(obj); CHECKMEM(obj);
json_object_object_add(memobj, "InUse", obj); json_object_object_add(memobj, "InUse", obj);
obj = json_object_new_int64(inuse);
CHECKMEM(obj);
json_object_object_add(memobj, "Malloced", obj);
json_object_object_add(memobj, "contexts", ctxarray); json_object_object_add(memobj, "contexts", ctxarray);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);