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

Relax extent hook tests to work with unsplittable extents.

Browse Source
This commit is contained in:
Jason Evans 2016-06-05 22:30:31 -07:00
parent 487093d999
commit 0c5cec833f
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/integration/extent.c
View File

@ -15,6 +15,7 @@ static bool did_dalloc;
static bool did_commit; static bool did_commit;
static bool did_decommit; static bool did_decommit;
static bool did_purge; static bool did_purge;
static bool tried_split;
static bool did_split; static bool did_split;
static bool did_merge; static bool did_merge;
@ -106,30 +107,35 @@ static bool
extent_split(extent_hooks_t *extent_hooks, void *addr, size_t size, extent_split(extent_hooks_t *extent_hooks, void *addr, size_t size,
size_t size_a, size_t size_b, bool committed, unsigned arena_ind) size_t size_a, size_t size_b, bool committed, unsigned arena_ind)
{ {
bool err;
TRACE_HOOK("%s(extent_hooks=%p, addr=%p, size=%zu, size_a=%zu, " TRACE_HOOK("%s(extent_hooks=%p, addr=%p, size=%zu, size_a=%zu, "
"size_b=%zu, committed=%s, arena_ind=%u)\n", __func__, extent_hooks, "size_b=%zu, committed=%s, arena_ind=%u)\n", __func__, extent_hooks,
addr, size, size_a, size_b, committed ? "true" : "false", addr, size, size_a, size_b, committed ? "true" : "false",
arena_ind); arena_ind);
assert(extent_hooks->split == extent_split); assert(extent_hooks->split == extent_split);
did_split = true; tried_split = true;
return (old_hooks->split(old_hooks, addr, size, size_a, size_b, err = old_hooks->split(old_hooks, addr, size, size_a, size_b, committed,
committed, arena_ind)); arena_ind);
did_split = !err;
return (err);
} }
static bool static bool
extent_merge(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a, extent_merge(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a,
void *addr_b, size_t size_b, bool committed, unsigned arena_ind) void *addr_b, size_t size_b, bool committed, unsigned arena_ind)
{ {
bool err;
TRACE_HOOK("%s(extent_hooks=%p, addr_a=%p, size_a=%zu, addr_b=%p " TRACE_HOOK("%s(extent_hooks=%p, addr_a=%p, size_a=%zu, addr_b=%p "
"size_b=%zu, committed=%s, arena_ind=%u)\n", __func__, extent_hooks, "size_b=%zu, committed=%s, arena_ind=%u)\n", __func__, extent_hooks,
addr_a, size_a, addr_b, size_b, committed ? "true" : "false", addr_a, size_a, addr_b, size_b, committed ? "true" : "false",
arena_ind); arena_ind);
assert(extent_hooks->merge == extent_merge); assert(extent_hooks->merge == extent_merge);
did_merge = true; err = old_hooks->merge(old_hooks, addr_a, size_a, addr_b, size_b,
return (old_hooks->merge(old_hooks, addr_a, size_a, addr_b, size_b, committed, arena_ind);
committed, arena_ind)); did_merge = !err;
return (err);
} }
TEST_BEGIN(test_extent) TEST_BEGIN(test_extent)
@ -199,6 +205,7 @@ TEST_BEGIN(test_extent)
did_dalloc = false; did_dalloc = false;
did_decommit = false; did_decommit = false;
did_purge = false; did_purge = false;
tried_split = false;
did_split = false; did_split = false;
xallocx_success_a = (xallocx(p, large0, 0, flags) == large0); xallocx_success_a = (xallocx(p, large0, 0, flags) == large0);
assert_d_eq(mallctlbymib(purge_mib, purge_miblen, NULL, NULL, NULL, 0), assert_d_eq(mallctlbymib(purge_mib, purge_miblen, NULL, NULL, NULL, 0),
@ -208,7 +215,7 @@ TEST_BEGIN(test_extent)
assert_false(did_decommit, "Unexpected decommit"); assert_false(did_decommit, "Unexpected decommit");
assert_true(did_purge, "Expected purge"); assert_true(did_purge, "Expected purge");
} }
assert_true(did_split, "Expected split"); assert_true(tried_split, "Expected split");
dallocx(p, flags); dallocx(p, flags);
do_dalloc = true; do_dalloc = true;
@ -219,6 +226,7 @@ TEST_BEGIN(test_extent)
assert_ptr_not_null(p, "Unexpected mallocx() error"); assert_ptr_not_null(p, "Unexpected mallocx() error");
did_decommit = false; did_decommit = false;
did_commit = false; did_commit = false;
tried_split = false;
did_split = false; did_split = false;
did_merge = false; did_merge = false;
xallocx_success_b = (xallocx(p, large0, 0, flags) == large0); xallocx_success_b = (xallocx(p, large0, 0, flags) == large0);
@ -227,7 +235,10 @@ TEST_BEGIN(test_extent)
if (xallocx_success_b) if (xallocx_success_b)
assert_true(did_split, "Expected split"); assert_true(did_split, "Expected split");
xallocx_success_c = (xallocx(p, large0 * 2, 0, flags) == large0 * 2); xallocx_success_c = (xallocx(p, large0 * 2, 0, flags) == large0 * 2);
assert_b_eq(did_decommit, did_commit, "Expected decommit/commit match"); if (did_split) {
assert_b_eq(did_decommit, did_commit,
"Expected decommit/commit match");
}
if (xallocx_success_b && xallocx_success_c) if (xallocx_success_b && xallocx_success_c)
assert_true(did_merge, "Expected merge"); assert_true(did_merge, "Expected merge");
dallocx(p, flags); dallocx(p, flags);