Reduce freemax values for dns_message mempools

It was discovered that NAME_FREEMAX and RDATASET_FREEMAX was based on
the NAME_FILLCOUNT and RDATASET_FILLCOUNT respectively multiplied by 8
and then when used in isc_mempool_setfreemax, the value would be again
multiplied by 32.

Keep the 8 multiplier in the #define and remove the 32 multiplier as it
was kept in error.  The default fillcount can fit 99.99% of the requests
under normal circumstances, so we don't need to keep that many free
items on the mempool.
This commit is contained in:
Ondřej Surý
2021-12-15 17:48:28 +01:00
parent ada8c28fd4
commit 72cc25465f

View File

@@ -722,12 +722,12 @@ dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp) {
isc_mempool_create(m->mctx, sizeof(dns_fixedname_t), &m->namepool);
isc_mempool_setfillcount(m->namepool, NAME_FILLCOUNT);
isc_mempool_setfreemax(m->namepool, 32 * NAME_FREEMAX);
isc_mempool_setfreemax(m->namepool, NAME_FREEMAX);
isc_mempool_setname(m->namepool, "msg:names");
isc_mempool_create(m->mctx, sizeof(dns_rdataset_t), &m->rdspool);
isc_mempool_setfillcount(m->rdspool, RDATASET_FILLCOUNT);
isc_mempool_setfreemax(m->rdspool, 32 * RDATASET_FREEMAX);
isc_mempool_setfreemax(m->rdspool, RDATASET_FREEMAX);
isc_mempool_setname(m->rdspool, "msg:rdataset");
isc_buffer_allocate(mctx, &dynbuf, SCRATCHPAD_SIZE);