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

Dodge ivsalloc() assertion in test code.

Browse Source
This commit is contained in:
Jason Evans 2016-05-17 10:36:17 -07:00
parent 93e79c5c3f
commit 25845db7c9
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/unit/arena_reset.c
View File

@ -78,6 +78,21 @@ get_huge_size(size_t ind)
return (get_size_impl("arenas.hchunk.0.size", ind)); return (get_size_impl("arenas.hchunk.0.size", ind));
} }
/* Like ivsalloc(), but safe to call on discarded allocations. */
static size_t
vsalloc(tsdn_t *tsdn, const void *ptr)
{
extent_t *extent;
extent = chunk_lookup(tsdn, ptr, false);
if (extent == NULL)
return (0);
if (!extent_active_get(extent))
return (0);
return (isalloc(tsdn, extent, ptr, false));
}
TEST_BEGIN(test_arena_reset) TEST_BEGIN(test_arena_reset)
{ {
#define NHUGE 4 #define NHUGE 4
@ -139,7 +154,7 @@ TEST_BEGIN(test_arena_reset)
/* Verify allocations no longer exist. */ /* Verify allocations no longer exist. */
for (i = 0; i < nptrs; i++) { for (i = 0; i < nptrs; i++) {
assert_zu_eq(ivsalloc(tsdn, ptrs[i], false), 0, assert_zu_eq(vsalloc(tsdn, ptrs[i]), 0,
"Allocation should no longer exist"); "Allocation should no longer exist");
} }