project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

psset unit test: fix a bug.

Browse Source 
The next commit adds assertions that reveal a bug in the test code
(double-free).  Fix it.
This commit is contained in:
David Goldblatt 2020-12-02 14:20:45 -08:00 committed by David Goldblatt
parent 54c94c1679
commit f51948d9e1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/unit/psset.c
View File

@ -204,7 +204,11 @@ TEST_BEGIN(test_reuse) {
expect_false(err, "Should have been able to find alloc."); expect_false(err, "Should have been able to find alloc.");
edata_expect(&alloc[index_of_3], index_of_3, 3); edata_expect(&alloc[index_of_3], index_of_3, 3);
/* Free up a 4-page hole at the end. */ /*
* Free up a 4-page hole at the end. Recall that the pages at offsets 0
* and 1 mod 4 were freed above, so we just have to free the last
* allocations.
*/
ps = test_psset_dalloc(&psset, &alloc[HUGEPAGE_PAGES - 1]); ps = test_psset_dalloc(&psset, &alloc[HUGEPAGE_PAGES - 1]);
expect_ptr_null(ps, "Nonempty pageslab evicted"); expect_ptr_null(ps, "Nonempty pageslab evicted");
ps = test_psset_dalloc(&psset, &alloc[HUGEPAGE_PAGES - 2]); ps = test_psset_dalloc(&psset, &alloc[HUGEPAGE_PAGES - 2]);
@ -212,8 +216,6 @@ TEST_BEGIN(test_reuse) {
/* Make sure we can satisfy an allocation at the very end of a slab. */ /* Make sure we can satisfy an allocation at the very end of a slab. */
size_t index_of_4 = HUGEPAGE_PAGES - 4; size_t index_of_4 = HUGEPAGE_PAGES - 4;
ps = test_psset_dalloc(&psset, &alloc[index_of_4]);
expect_ptr_null(ps, "Nonempty pageslab evicted");
err = test_psset_alloc_reuse(&psset, &alloc[index_of_4], 4 * PAGE); err = test_psset_alloc_reuse(&psset, &alloc[index_of_4], 4 * PAGE);
expect_false(err, "Should have been able to find alloc."); expect_false(err, "Should have been able to find alloc.");
edata_expect(&alloc[index_of_4], index_of_4, 4); edata_expect(&alloc[index_of_4], index_of_4, 4);
@ -405,7 +407,8 @@ TEST_END
/* /*
* Fills in and inserts two pageslabs, with the first better than the second, * Fills in and inserts two pageslabs, with the first better than the second,
* and each fully allocated (into the allocations in allocs and worse_allocs, * and each fully allocated (into the allocations in allocs and worse_allocs,
* each of which should be HUGEPAGE_PAGES long). * each of which should be HUGEPAGE_PAGES long), except for a single free page
* at the end.
* *
* (There's nothing magic about these numbers; it's just useful to share the * (There's nothing magic about these numbers; it's just useful to share the
* setup between the oldest fit and the insert/remove test). * setup between the oldest fit and the insert/remove test).
@ -418,7 +421,7 @@ init_test_pageslabs(psset_t *psset, hpdata_t *pageslab,
hpdata_init(pageslab, (void *)(10 * HUGEPAGE), PAGESLAB_AGE); hpdata_init(pageslab, (void *)(10 * HUGEPAGE), PAGESLAB_AGE);
/* /*
* This pageslab would be better from an address-first-fit POV, but * This pageslab would be better from an address-first-fit POV, but
* better from an age POV. * worse from an age POV.
*/ */
hpdata_init(worse_pageslab, (void *)(9 * HUGEPAGE), PAGESLAB_AGE + 1); hpdata_init(worse_pageslab, (void *)(9 * HUGEPAGE), PAGESLAB_AGE + 1);