ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Compact more in dns_qp_compact(DNS_QPGC_ALL)

Browse Source 
Commit 0858514ae8 enriched dns_qp_compact() to give callers more
control over how thoroughly the trie should be compacted.

In the DNS_QPGC_ALL case, if the trie is small it might be compacted
to a new position in the same memory chunk. In this situation it will
still be holding references to old leaf objects which have been
removed from the trie but will not be completely detached until the
chunk containing the references is freed.

This change resets the qp-trie allocator to a fresh chunk before a
DNS_QPGC_ALL compaction, so all the old memory chunks will be
evacuated and old leaf objects can be detached sooner.
This commit is contained in:
Tony Finch
2023-03-03 12:05:51 +00:00
parent 44c80c4ae1
commit 39f38754e2
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/dns/qp.c
View File

@@ -903,6 +903,7 @@ dns_qp_compact(dns_qp_t *qp, dns_qpgc_t mode) {
return;
}
if (mode == DNS_QPGC_ALL) {
alloc_reset(qp);
qp->compact_all = true;
}
compact(qp);

2
tests/bench/load-names.c
View File

@@ -164,7 +164,7 @@ add_qp(void *qp, size_t count) {
static void
sqz_qp(void *qp) {
dns_qp_compact(qp, true);
dns_qp_compact(qp, DNS_QPGC_ALL);
}
static isc_result_t

2
tests/bench/qp-dump.c
View File

@@ -224,7 +224,7 @@ main(int argc, char *argv[]) {
labels += name->labels;
names += 1;
}
dns_qp_compact(qp, true);
dns_qp_compact(qp, DNS_QPGC_ALL);
size_t smallbytes = wirebytes + labels + names * sizeof(isc_refcount_t);
dns_qp_memusage_t memusage = dns_qp_memusage(qp);

8
tests/bench/qpmulti.c
View File

@@ -323,8 +323,12 @@ mutate_transactions(uv_idle_t *idle) {
args->absent++;
}
}
/*
* We would normally use DNS_QPGC_MAYBE, but here we do the
* fragmented check ourself so we can count compactions
*/
if (dns_qp_memusage(qp).fragmented) {
dns_qp_compact(qp, false);
dns_qp_compact(qp, DNS_QPGC_NOW);
args->compactions++;
}
dns_qpmulti_commit(args->multi, &qp);
@@ -392,7 +396,7 @@ load_multi(struct bench_state *bctx) {
item[i].present = true;
count++;
}
dns_qp_compact(qp, true);
dns_qp_compact(qp, DNS_QPGC_ALL);
dns_qpmulti_commit(bctx->multi, &qp);
bctx->load_time = isc_time_monotonic() - start;