Derp. Fix missing constant post rename

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 67d1c1d8051c6ca5fa776cbdbf559609e51fb323..b81afb4638842c226ef5fbf21e5589c3330f6c22 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1360,17 +1360,26 @@ isc__mempool_put(isc_mempool_t *mpctx, void *mem FLARG) {
 
        isc_mem_t *mctx = mpctx->mctx;
        element *item;
-       size_t freecount = atomic_load_relaxed(&mpctx->freecount[isc_tid_v]);
        size_t allocated = atomic_fetch_sub_relaxed(&mpctx->allocated, 1);
+       (void)atomic_fetch_add_relaxed(&mpctx->freecount[isc_tid_v], 1);
+       /* size_t freecount = atomic_fetch_add_relaxed(&mpctx->freecount[isc_tid_v], 1); */
+       /* size_t freemax = ISC_MAX(allocated, 8); */
 
        INSIST(allocated > 0);
 
+       /* while (freecount > freemax) { */
+       /*      item = mpctx->items[isc_tid_v]; */
+       /*      mpctx->items[isc_tid_v] = item->next; */
+       /*      freecount = atomic_fetch_sub_relaxed(&mpctx->freecount[isc_tid_v], 1); */
+       /*      mem_putstats(mctx, item, mpctx->size); */
+       /*      mem_put(mctx, item, mpctx->size); */
+       /* } */
+
        DELETE_TRACE(mctx, mem, mpctx->size, file, line);
 
        item = (element *)mem;
        item->next = mpctx->items[isc_tid_v];
        mpctx->items[isc_tid_v] = item;
-       atomic_fetch_add_relaxed(&mpctx->freecount[isc_tid_v], 1);
 }
 
 #endif /* __SANITIZE_ADDRESS__ */

diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c
index 4a8dea2a5d6c1c67df72ce9dbac425d0c9835c6d..52ec5dff93e17dedb9572deb7a0b16a973634f04 100644 (file)
--- a/lib/isc/tests/mem_test.c
+++ b/lib/isc/tests/mem_test.c
@@ -355,7 +355,8 @@ isc_mem_traceflag_test(void **state) {
 
 #define ITERS    512
 #define NUM_ITEMS 1024 /* 768 */
-#define ITEM_SIZE 256
+#define ITEM_SIZE 1024
+#define MP_ITEM_SIZE 256
 
 static atomic_size_t mem_size;
 
@@ -441,7 +442,7 @@ isc_mempool_benchmark(void **state) {
 
        isc_mutex_init(&mplock);
 
-       isc_mempool_create(test_mctx, ITEM_SIZE, &mp);
+       isc_mempool_create(test_mctx, MP_ITEM_SIZE, &mp);
 
        isc_mempool_associatelock(mp, &mplock);