Skip to content

Reduce memory fragmentation with RRsets with many RRs in them #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wtoorop wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Reduce memory fragmentation with RRsets with many RRs in them #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eabce56
Let nsd-mem also report recycle bin usage
wtoorop Dec 20, 2025
1902184
While parsing, commit RRs within RRsets in batches
wtoorop Dec 20, 2025
ba8596d
Define dependent struct member error
wtoorop Dec 20, 2025
3977530
Fix for NULL pointer dereference
wtoorop Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 48 additions & 13 deletions nsd-mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "config.h"

#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -45,6 +46,8 @@ struct zone_mem {
size_t data;
/* unused space (in db.region) due to alignment */
size_t data_unused;
/* space in recycle_bin */
size_t recycle_bin;

/* count of number of domains */
size_t domaincount;
Expand All @@ -56,6 +59,8 @@ struct tot_mem {
size_t data;
/* unused space (in db.region) due to alignment */
size_t data_unused;
/* space in recycle_bin */
size_t recycle_bin;

/* count of number of domains */
size_t domaincount;
Expand All @@ -64,6 +69,8 @@ struct tot_mem {
size_t opt_data;
/* unused in options region */
size_t opt_unused;
/* space in recycle_bin */
size_t opt_recycle_bin;
/* dname compression table */
size_t compresstable;
#ifdef RATELIMIT
Expand All @@ -80,29 +87,55 @@ account_zone(struct namedb* db, struct zone_mem* zmem)
{
zmem->data = region_get_mem(db->region);
zmem->data_unused = region_get_mem_unused(db->region);
zmem->recycle_bin = region_get_recycle_size(db->region);
zmem->domaincount = domain_table_count(db->domains);
}

static char*
pretty_num(size_t x)
{
static char buf[32];
memset(buf, 0, sizeof(buf));
if(snprintf(buf, sizeof(buf), "%12lld", (long long)x) <= 12) {
snprintf(buf, sizeof(buf), "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
buf[0], buf[1], buf[2], (buf[2]==' '?' ':'.'),
buf[3], buf[4], buf[5], (buf[5]==' '?' ':'.'),
buf[6], buf[7], buf[8], (buf[8]==' '?' ':'.'),
buf[9], buf[10], buf[11]);
}
return buf;
}

static const char*
skip_ws(const char* str)
{
while (isspace(*str))
str++;
return str;
}

static void
pretty_mem(size_t x, const char* s)
{
char buf[32];
memset(buf, 0, sizeof(buf));
if(snprintf(buf, sizeof(buf), "%12lld", (long long)x) > 12) {
printf("%12lld %s\n", (long long)x, s);
return;
printf("%s %s\n", pretty_num(x), s);
}

static void
pretty_mem_recycle_bin(size_t x, const char* s, size_t recycle_bin_sz)
{
printf("%s %s", pretty_num(x), s);
if (recycle_bin_sz) {
printf(" (of which %s in the recycle bin)",
skip_ws(pretty_num(recycle_bin_sz)));
}
printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c %s\n",
buf[0], buf[1], buf[2], (buf[2]==' '?' ':'.'),
buf[3], buf[4], buf[5], (buf[5]==' '?' ':'.'),
buf[6], buf[7], buf[8], (buf[8]==' '?' ':'.'),
buf[9], buf[10], buf[11], s);
printf("\n");
}


static void
print_zone_mem(struct zone_mem* z)
{
pretty_mem(z->data, "zone data");
pretty_mem_recycle_bin(z->data, "zone data", z->recycle_bin);
pretty_mem(z->data_unused, "zone unused space (due to alignment)");
}

Expand All @@ -111,6 +144,7 @@ account_total(struct nsd_options* opt, struct tot_mem* t)
{
t->opt_data = region_get_mem(opt->region);
t->opt_unused = region_get_mem_unused(opt->region);
t->opt_recycle_bin = region_get_recycle_size(opt->region);
t->compresstable = sizeof(uint16_t) *
(t->domaincount + 1 + EXTRA_DOMAIN_NUMBERS);
t->compresstable *= opt->server_count;
Expand All @@ -132,9 +166,9 @@ static void
print_tot_mem(struct tot_mem* t)
{
printf("\ntotal\n");
pretty_mem(t->data, "data");
pretty_mem_recycle_bin(t->data, "data", t->recycle_bin);
pretty_mem(t->data_unused, "unused space (due to alignment)");
pretty_mem(t->opt_data, "options");
pretty_mem_recycle_bin(t->opt_data, "options", t->opt_recycle_bin);
pretty_mem(t->opt_unused, "options unused space (due to alignment)");
pretty_mem(t->compresstable, "name table (depends on servercount)");
#ifdef RATELIMIT
Expand All @@ -150,6 +184,7 @@ add_mem(struct tot_mem* t, struct zone_mem* z)
{
t->data += z->data;
t->data_unused += z->data_unused;
t->recycle_bin += z->recycle_bin;
t->domaincount += z->domaincount;
}

Expand Down
Loading