Cache_bin: Shouldn't know about tcache.

Instead, have it take the cache_bin_info_ts to use by pointer.  While we're
here, add a src file for the cache bin.
This commit is contained in:
David Goldblatt
2020-02-25 12:14:48 -08:00
committed by David Goldblatt
parent 79f1ee2fc0
commit 909c501b07
12 changed files with 101 additions and 67 deletions

View File

@@ -10,48 +10,51 @@ TEST_BEGIN(test_cache_bin) {
expect_ptr_not_null(stack, "Unexpected mallocx failure");
/* Initialize to empty; bin 0. */
cache_bin_sz_t ncached_max = cache_bin_ncached_max_get(0);
cache_bin_sz_t ncached_max = cache_bin_ncached_max_get(0,
tcache_bin_info);
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, 0), empty_position,
"Incorrect empty position");
expect_ptr_eq(cache_bin_empty_position_get(bin, 0, tcache_bin_info),
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, 0) == 0, "Incorrect cache size");
expect_true(cache_bin_ncached_get(bin, 0, tcache_bin_info) == 0,
"Incorrect cache size");
bool success;
void *ret = cache_bin_alloc_easy(bin, &success, 0);
void *ret = cache_bin_alloc_easy(bin, &success, 0, tcache_bin_info);
expect_false(success, "Empty cache bin should not alloc");
expect_true(cache_bin_low_water_get(bin, 0) == 0,
expect_true(cache_bin_low_water_get(bin, 0, tcache_bin_info) == 0,
"Incorrect low water mark");
cache_bin_ncached_set(bin, 0, 0);
cache_bin_ncached_set(bin, 0, 0, tcache_bin_info);
expect_ptr_eq(bin->cur_ptr.ptr, empty_position, "Bin should be empty");
for (cache_bin_sz_t i = 1; i < ncached_max + 1; i++) {
success = cache_bin_dalloc_easy(bin, (void *)(uintptr_t)i);
expect_true(success && cache_bin_ncached_get(bin, 0) == i,
"Bin dalloc failure");
expect_true(success && cache_bin_ncached_get(bin, 0,
tcache_bin_info) == i, "Bin dalloc failure");
}
success = cache_bin_dalloc_easy(bin, (void *)1);
expect_false(success, "Bin should be full");
expect_ptr_eq(bin->cur_ptr.ptr, stack, "Incorrect bin cur_ptr");
cache_bin_ncached_set(bin, 0, ncached_max);
cache_bin_ncached_set(bin, 0, ncached_max, tcache_bin_info);
expect_ptr_eq(bin->cur_ptr.ptr, stack, "cur_ptr should not change");
/* Emulate low water after refill. */
bin->low_water_position = bin->full_position;
for (cache_bin_sz_t i = ncached_max; i > 0; i--) {
ret = cache_bin_alloc_easy(bin, &success, 0);
cache_bin_sz_t ncached = cache_bin_ncached_get(bin, 0);
ret = cache_bin_alloc_easy(bin, &success, 0, tcache_bin_info);
cache_bin_sz_t ncached = cache_bin_ncached_get(bin, 0,
tcache_bin_info);
expect_true(success && ncached == i - 1,
"Cache bin alloc failure");
expect_ptr_eq(ret, (void *)(uintptr_t)i, "Bin alloc failure");
expect_true(cache_bin_low_water_get(bin, 0) == ncached,
"Incorrect low water mark");
expect_true(cache_bin_low_water_get(bin, 0, tcache_bin_info)
== ncached, "Incorrect low water mark");
}
ret = cache_bin_alloc_easy(bin, &success, 0);
ret = cache_bin_alloc_easy(bin, &success, 0, tcache_bin_info);
expect_false(success, "Empty cache bin should not alloc.");
expect_ptr_eq(bin->cur_ptr.ptr, stack + ncached_max,
"Bin should be empty");