mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Remove the Lost memory counter

Browse Source 
The Lost memory counter would count the memory "lost" by external
libraries.  There's really no such thing as `named` require the memory
contexts to be clean on destroy.
This commit is contained in:
Ondřej Surý
2023-01-19 12:02:17 +01:00
parent 7588cd5cb1
commit 699736b7bb
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/isc/mem.c
View File

@@ -119,12 +119,6 @@ static isc_once_t init_once = ISC_ONCE_INIT;
static isc_once_t shut_once = ISC_ONCE_INIT; static isc_once_t shut_once = ISC_ONCE_INIT;
static isc_mutex_t contextslock; static isc_mutex_t contextslock;
/*%
* Total size of lost memory due to a bug of external library.
* Locked by the global lock.
*/
static uint64_t totallost;
struct isc_mem { struct isc_mem {
unsigned int magic; unsigned int magic;
unsigned int flags; unsigned int flags;
@@ -401,7 +395,6 @@ mem_initialize(void) {
isc_mutex_init(&contextslock); isc_mutex_init(&contextslock);
ISC_LIST_INIT(contexts); ISC_LIST_INIT(contexts);
totallost = 0;
} }
void void
@@ -477,7 +470,6 @@ static void
destroy(isc_mem_t *ctx) { destroy(isc_mem_t *ctx) {
LOCK(&contextslock); LOCK(&contextslock);
ISC_LIST_UNLINK(contexts, ctx, link); ISC_LIST_UNLINK(contexts, ctx, link);
totallost += isc_mem_inuse(ctx);
UNLOCK(&contextslock); UNLOCK(&contextslock);
ctx->magic = 0; ctx->magic = 0;
@@ -1404,14 +1396,12 @@ int
isc_mem_renderxml(void *writer0) { isc_mem_renderxml(void *writer0) {
isc_mem_t *ctx; isc_mem_t *ctx;
summarystat_t summary = { 0 }; summarystat_t summary = { 0 };
uint64_t lost;
int xmlrc; int xmlrc;
xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0;
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "contexts")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "contexts"));
LOCK(&contextslock); LOCK(&contextslock);
lost = totallost;
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))
{ {
@@ -1437,10 +1427,6 @@ isc_mem_renderxml(void *writer0) {
summary.contextsize)); summary.contextsize));
TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */ TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Lost"));
TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", lost));
TRY0(xmlTextWriterEndElement(writer)); /* Lost */
TRY0(xmlTextWriterEndElement(writer)); /* summary */ TRY0(xmlTextWriterEndElement(writer)); /* summary */
error: error:
return (xmlrc); return (xmlrc);
@@ -1518,7 +1504,6 @@ 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 }; summarystat_t summary = { 0 };
uint64_t lost;
json_object *ctxarray, *obj; json_object *ctxarray, *obj;
json_object *memobj = (json_object *)memobj0; json_object *memobj = (json_object *)memobj0;
@@ -1526,7 +1511,6 @@ isc_mem_renderjson(void *memobj0) {
CHECKMEM(ctxarray); CHECKMEM(ctxarray);
LOCK(&contextslock); LOCK(&contextslock);
lost = totallost;
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))
{ {
@@ -1546,10 +1530,6 @@ isc_mem_renderjson(void *memobj0) {
CHECKMEM(obj); CHECKMEM(obj);
json_object_object_add(memobj, "ContextSize", obj); json_object_object_add(memobj, "ContextSize", obj);
obj = json_object_new_int64(lost);
CHECKMEM(obj);
json_object_object_add(memobj, "Lost", obj);
json_object_object_add(memobj, "contexts", ctxarray); json_object_object_add(memobj, "contexts", ctxarray);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);