Cache bin: Write the unit test in terms of the API
I.e. stop allowing the unit test to have secret access to implementation internals.
This commit is contained in:
David Goldblatt
David Goldblatt
parent
7f5ebd211c
commit
370c1ea007
@ -169,6 +169,10 @@ cache_bin_low_water_set(cache_bin_t *bin) {
|
|||||||
bin->low_water_position = bin->cur_ptr.lowbits;
|
bin->low_water_position = bin->cur_ptr.lowbits;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is an internal implementation detail -- users should only affect ncached
|
||||||
|
* via single-item pushes or batch fills.
|
||||||
|
*/
|
||||||
static inline void
|
static inline void
|
||||||
cache_bin_ncached_set(cache_bin_t *bin, cache_bin_info_t *info,
|
cache_bin_ncached_set(cache_bin_t *bin, cache_bin_info_t *info,
|
||||||
cache_bin_sz_t n) {
|
cache_bin_sz_t n) {
|
||||||
|
|||||||
@ -1,63 +1,200 @@
|
|||||||
#include "test/jemalloc_test.h"
|
#include "test/jemalloc_test.h"
|
||||||
|
|
||||||
cache_bin_t test_bin;
|
static void
|
||||||
|
do_fill_test(cache_bin_t *bin, cache_bin_info_t *info, void **ptrs,
|
||||||
|
cache_bin_sz_t ncached_max, cache_bin_sz_t nfill_attempt,
|
||||||
|
cache_bin_sz_t nfill_succeed) {
|
||||||
|
bool success;
|
||||||
|
void *ptr;
|
||||||
|
assert_true(cache_bin_ncached_get(bin, info) == 0, "");
|
||||||
|
CACHE_BIN_PTR_ARRAY_DECLARE(arr, nfill_attempt);
|
||||||
|
cache_bin_init_ptr_array_for_fill(bin, info, &arr, nfill_attempt);
|
||||||
|
for (cache_bin_sz_t i = 0; i < nfill_succeed; i++) {
|
||||||
|
arr.ptr[i] = &ptrs[i];
|
||||||
|
}
|
||||||
|
cache_bin_finish_fill(bin, info, &arr, nfill_succeed);
|
||||||
|
expect_true(cache_bin_ncached_get(bin, info) == nfill_succeed, "");
|
||||||
|
cache_bin_low_water_set(bin);
|
||||||
|
|
||||||
|
for (cache_bin_sz_t i = 0; i < nfill_succeed; i++) {
|
||||||
|
ptr = cache_bin_alloc_easy(bin, info, &success);
|
||||||
|
expect_true(success, "");
|
||||||
|
expect_ptr_eq(ptr, (void *)&ptrs[i],
|
||||||
|
"Should pop in order filled");
|
||||||
|
expect_true(cache_bin_low_water_get(bin, info)
|
||||||
|
== nfill_succeed - i - 1, "");
|
||||||
|
}
|
||||||
|
expect_true(cache_bin_ncached_get(bin, info) == 0, "");
|
||||||
|
expect_true(cache_bin_low_water_get(bin, info) == 0, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
do_flush_test(cache_bin_t *bin, cache_bin_info_t *info, void **ptrs,
|
||||||
|
cache_bin_sz_t nfill, cache_bin_sz_t nflush) {
|
||||||
|
bool success;
|
||||||
|
assert_true(cache_bin_ncached_get(bin, info) == 0, "");
|
||||||
|
|
||||||
|
for (cache_bin_sz_t i = 0; i < nfill; i++) {
|
||||||
|
success = cache_bin_dalloc_easy(bin, &ptrs[i]);
|
||||||
|
expect_true(success, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
CACHE_BIN_PTR_ARRAY_DECLARE(arr, nflush);
|
||||||
|
cache_bin_init_ptr_array_for_flush(bin, info, &arr, nflush);
|
||||||
|
for (cache_bin_sz_t i = 0; i < nflush; i++) {
|
||||||
|
expect_ptr_eq(cache_bin_ptr_array_get(&arr, i), &ptrs[i], "");
|
||||||
|
}
|
||||||
|
cache_bin_finish_flush(bin, info, &arr, nflush);
|
||||||
|
|
||||||
|
expect_true(cache_bin_ncached_get(bin, info) == nfill - nflush, "");
|
||||||
|
while (cache_bin_ncached_get(bin, info) > 0) {
|
||||||
|
cache_bin_alloc_easy(bin, info, &success);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
TEST_BEGIN(test_cache_bin) {
|
TEST_BEGIN(test_cache_bin) {
|
||||||
cache_bin_t *bin = &test_bin;
|
|
||||||
assert(PAGE > TCACHE_NSLOTS_SMALL_MAX * sizeof(void *));
|
|
||||||
/* Page aligned to make sure lowbits not overflowable. */
|
|
||||||
void **stack = mallocx(PAGE, MALLOCX_TCACHE_NONE | MALLOCX_ALIGN(PAGE));
|
|
||||||
|
|
||||||
expect_ptr_not_null(stack, "Unexpected mallocx failure");
|
|
||||||
/* Initialize to empty; bin 0. */
|
|
||||||
cache_bin_sz_t ncached_max = cache_bin_info_ncached_max(
|
|
||||||
&tcache_bin_info[0]);
|
|
||||||
void **empty_position = stack + ncached_max;
|
|
||||||
bin->cur_ptr.ptr = empty_position;
|
|
||||||
bin->low_water_position = bin->cur_ptr.lowbits;
|
|
||||||
bin->full_position = (uint32_t)(uintptr_t)stack;
|
|
||||||
expect_ptr_eq(cache_bin_empty_position_get(bin, &tcache_bin_info[0]),
|
|
||||||
empty_position, "Incorrect empty position");
|
|
||||||
/* Not using expect_zu etc on cache_bin_sz_t since it may change. */
|
|
||||||
expect_true(cache_bin_ncached_get(bin, &tcache_bin_info[0]) == 0,
|
|
||||||
"Incorrect cache size");
|
|
||||||
|
|
||||||
bool success;
|
bool success;
|
||||||
void *ret = cache_bin_alloc_easy(bin, &tcache_bin_info[0], &success);
|
void *ptr;
|
||||||
expect_false(success, "Empty cache bin should not alloc");
|
|
||||||
expect_true(cache_bin_low_water_get(bin, &tcache_bin_info[0]) == 0,
|
|
||||||
"Incorrect low water mark");
|
|
||||||
|
|
||||||
cache_bin_ncached_set(bin, &tcache_bin_info[0], 0);
|
cache_bin_t bin;
|
||||||
expect_ptr_eq(bin->cur_ptr.ptr, empty_position, "Bin should be empty");
|
cache_bin_info_t info;
|
||||||
for (cache_bin_sz_t i = 1; i < ncached_max + 1; i++) {
|
cache_bin_info_init(&info, TCACHE_NSLOTS_SMALL_MAX);
|
||||||
success = cache_bin_dalloc_easy(bin, (void *)(uintptr_t)i);
|
|
||||||
expect_true(success && cache_bin_ncached_get(bin,
|
size_t size;
|
||||||
&tcache_bin_info[0]) == i, "Bin dalloc failure");
|
size_t alignment;
|
||||||
|
cache_bin_info_compute_alloc(&info, 1, &size, &alignment);
|
||||||
|
void *mem = mallocx(size, MALLOCX_ALIGN(alignment));
|
||||||
|
assert_ptr_not_null(mem, "Unexpected mallocx failure");
|
||||||
|
|
||||||
|
size_t cur_offset = 0;
|
||||||
|
cache_bin_preincrement(&info, 1, mem, &cur_offset);
|
||||||
|
cache_bin_init(&bin, &info, mem, &cur_offset);
|
||||||
|
cache_bin_postincrement(&info, 1, mem, &cur_offset);
|
||||||
|
|
||||||
|
assert_zu_eq(cur_offset, size, "Should use all requested memory");
|
||||||
|
|
||||||
|
/* Initialize to empty; should then have 0 elements. */
|
||||||
|
cache_bin_sz_t ncached_max = cache_bin_info_ncached_max(&info);
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info) == 0, "");
|
||||||
|
expect_true(cache_bin_low_water_get(&bin, &info) == 0, "");
|
||||||
|
|
||||||
|
ptr = cache_bin_alloc_easy_reduced(&bin, &success);
|
||||||
|
expect_false(success, "Shouldn't successfully allocate when empty");
|
||||||
|
expect_ptr_null(ptr, "Shouldn't get a non-null pointer on failure");
|
||||||
|
|
||||||
|
ptr = cache_bin_alloc_easy(&bin, &info, &success);
|
||||||
|
expect_false(success, "Shouldn't successfully allocate when empty");
|
||||||
|
expect_ptr_null(ptr, "Shouldn't get a non-null pointer on failure");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We allocate one more item than ncached_max, so we can test cache bin
|
||||||
|
* exhaustion.
|
||||||
|
*/
|
||||||
|
void **ptrs = mallocx(sizeof(void *) * (ncached_max + 1), 0);
|
||||||
|
assert_ptr_not_null(ptrs, "Unexpected mallocx failure");
|
||||||
|
for (cache_bin_sz_t i = 0; i < ncached_max; i++) {
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info) == i, "");
|
||||||
|
success = cache_bin_dalloc_easy(&bin, &ptrs[i]);
|
||||||
|
expect_true(success,
|
||||||
|
"Should be able to dalloc into a non-full cache bin.");
|
||||||
|
expect_true(cache_bin_low_water_get(&bin, &info) == 0,
|
||||||
|
"Pushes and pops shouldn't change low water of zero.");
|
||||||
}
|
}
|
||||||
success = cache_bin_dalloc_easy(bin, (void *)1);
|
expect_true(cache_bin_ncached_get(&bin, &info) == ncached_max, "");
|
||||||
expect_false(success, "Bin should be full");
|
success = cache_bin_dalloc_easy(&bin, &ptrs[ncached_max]);
|
||||||
expect_ptr_eq(bin->cur_ptr.ptr, stack, "Incorrect bin cur_ptr");
|
expect_false(success, "Shouldn't be able to dalloc into a full bin.");
|
||||||
|
|
||||||
cache_bin_ncached_set(bin, &tcache_bin_info[0], ncached_max);
|
cache_bin_low_water_set(&bin);
|
||||||
expect_ptr_eq(bin->cur_ptr.ptr, stack, "cur_ptr should not change");
|
|
||||||
/* Emulate low water after refill. */
|
for (cache_bin_sz_t i = 0; i < ncached_max; i++) {
|
||||||
bin->low_water_position = bin->full_position;
|
expect_true(cache_bin_low_water_get(&bin, &info)
|
||||||
for (cache_bin_sz_t i = ncached_max; i > 0; i--) {
|
== ncached_max - i, "");
|
||||||
ret = cache_bin_alloc_easy(bin, &tcache_bin_info[0], &success);
|
expect_true(cache_bin_ncached_get(&bin, &info)
|
||||||
cache_bin_sz_t ncached = cache_bin_ncached_get(bin,
|
== ncached_max - i, "");
|
||||||
&tcache_bin_info[0]);
|
/*
|
||||||
expect_true(success && ncached == i - 1,
|
* This should fail -- the reduced version can't change low
|
||||||
"Cache bin alloc failure");
|
* water.
|
||||||
expect_ptr_eq(ret, (void *)(uintptr_t)i, "Bin alloc failure");
|
*/
|
||||||
expect_true(cache_bin_low_water_get(bin, &tcache_bin_info[0])
|
ptr = cache_bin_alloc_easy_reduced(&bin, &success);
|
||||||
== ncached, "Incorrect low water mark");
|
expect_ptr_null(ptr, "");
|
||||||
|
expect_false(success, "");
|
||||||
|
expect_true(cache_bin_low_water_get(&bin, &info)
|
||||||
|
== ncached_max - i, "");
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info)
|
||||||
|
== ncached_max - i, "");
|
||||||
|
|
||||||
|
/* This should succeed, though. */
|
||||||
|
ptr = cache_bin_alloc_easy(&bin, &info, &success);
|
||||||
|
expect_true(success, "");
|
||||||
|
expect_ptr_eq(ptr, &ptrs[ncached_max - i - 1],
|
||||||
|
"Alloc should pop in stack order");
|
||||||
|
expect_true(cache_bin_low_water_get(&bin, &info)
|
||||||
|
== ncached_max - i - 1, "");
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info)
|
||||||
|
== ncached_max - i - 1, "");
|
||||||
|
}
|
||||||
|
/* Now we're empty -- all alloc attempts should fail. */
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info) == 0, "");
|
||||||
|
ptr = cache_bin_alloc_easy_reduced(&bin, &success);
|
||||||
|
expect_ptr_null(ptr, "");
|
||||||
|
expect_false(success, "");
|
||||||
|
ptr = cache_bin_alloc_easy(&bin, &info, &success);
|
||||||
|
expect_ptr_null(ptr, "");
|
||||||
|
expect_false(success, "");
|
||||||
|
|
||||||
|
for (cache_bin_sz_t i = 0; i < ncached_max / 2; i++) {
|
||||||
|
cache_bin_dalloc_easy(&bin, &ptrs[i]);
|
||||||
|
}
|
||||||
|
cache_bin_low_water_set(&bin);
|
||||||
|
|
||||||
|
for (cache_bin_sz_t i = ncached_max / 2; i < ncached_max; i++) {
|
||||||
|
cache_bin_dalloc_easy(&bin, &ptrs[i]);
|
||||||
|
}
|
||||||
|
expect_true(cache_bin_ncached_get(&bin, &info) == ncached_max, "");
|
||||||
|
for (cache_bin_sz_t i = ncached_max - 1; i >= ncached_max / 2; i--) {
|
||||||
|
/*
|
||||||
|
* Size is bigger than low water -- the reduced version should
|
||||||
|
* succeed.
|
||||||
|
*/
|
||||||
|
ptr = cache_bin_alloc_easy_reduced(&bin, &success);
|
||||||
|
expect_true(success, "");
|
||||||
|
expect_ptr_eq(ptr, &ptrs[i], "");
|
||||||
|
}
|
||||||
|
/* But now, we've hit low-water. */
|
||||||
|
ptr = cache_bin_alloc_easy_reduced(&bin, &success);
|
||||||
|
expect_false(success, "");
|
||||||
|
expect_ptr_null(ptr, "");
|
||||||
|
|
||||||
|
/* We're going to test filling -- we must be empty to start. */
|
||||||
|
while (cache_bin_ncached_get(&bin, &info)) {
|
||||||
|
cache_bin_alloc_easy(&bin, &info, &success);
|
||||||
|
expect_true(success, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = cache_bin_alloc_easy(bin, &tcache_bin_info[0], &success);
|
/* Test fill. */
|
||||||
expect_false(success, "Empty cache bin should not alloc.");
|
/* Try to fill all, succeed fully. */
|
||||||
expect_ptr_eq(bin->cur_ptr.ptr, stack + ncached_max,
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max, ncached_max);
|
||||||
"Bin should be empty");
|
/* Try to fill all, succeed partially. */
|
||||||
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max,
|
||||||
|
ncached_max / 2);
|
||||||
|
/* Try to fill all, fail completely. */
|
||||||
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max, 0);
|
||||||
|
|
||||||
|
/* Try to fill some, succeed fully. */
|
||||||
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max / 2,
|
||||||
|
ncached_max / 2);
|
||||||
|
/* Try to fill some, succeed partially. */
|
||||||
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max / 2,
|
||||||
|
ncached_max / 2);
|
||||||
|
/* Try to fill some, fail completely. */
|
||||||
|
do_fill_test(&bin, &info, ptrs, ncached_max, ncached_max / 2, 0);
|
||||||
|
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max, ncached_max);
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max, ncached_max / 2);
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max, 0);
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max / 2, ncached_max / 2);
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max / 2, ncached_max / 4);
|
||||||
|
do_flush_test(&bin, &info, ptrs, ncached_max / 2, 0);
|
||||||
}
|
}
|
||||||
TEST_END
|
TEST_END
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user