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

Fix intermittent xallocx() test failures.

Browse Source 
Modify xallocx() tests that expect to expand in place to use a separate
arena.  This avoids the potential for interposed internal allocations
from e.g. heap profile sampling to disrupt the tests.

This resolves #286.
This commit is contained in:
Jason Evans 2015-10-01 13:48:09 -07:00
parent a784e411f2
commit fed1f9f367
1 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
test/integration/xallocx.c
View File

@ -1,5 +1,24 @@
#include "test/jemalloc_test.h" #include "test/jemalloc_test.h"
/*
* Use a separate arena for xallocx() extension/contraction tests so that
* internal allocation e.g. by heap profiling can't interpose allocations where
* xallocx() would ordinarily be able to extend.
*/
static unsigned
arena_ind(void)
{
static unsigned ind = 0;
if (ind == 0) {
size_t sz = sizeof(ind);
assert_d_eq(mallctl("arenas.extend", &ind, &sz, NULL, 0), 0,
"Unexpected mallctl failure creating arena");
}
return (ind);
}
TEST_BEGIN(test_same_size) TEST_BEGIN(test_same_size)
{ {
void *p; void *p;
@ -218,6 +237,7 @@ TEST_END
TEST_BEGIN(test_extra_large) TEST_BEGIN(test_extra_large)
{ {
int flags = MALLOCX_ARENA(arena_ind());
size_t smallmax, large0, large1, large2, huge0, hugemax; size_t smallmax, large0, large1, large2, huge0, hugemax;
void *p; void *p;
@ -229,61 +249,62 @@ TEST_BEGIN(test_extra_large)
huge0 = get_huge_size(0); huge0 = get_huge_size(0);
hugemax = get_huge_size(get_nhuge()-1); hugemax = get_huge_size(get_nhuge()-1);
p = mallocx(large2, 0); p = mallocx(large2, flags);
assert_ptr_not_null(p, "Unexpected mallocx() error"); assert_ptr_not_null(p, "Unexpected mallocx() error");
assert_zu_eq(xallocx(p, large2, 0, 0), large2, assert_zu_eq(xallocx(p, large2, 0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size decrease with zero extra. */ /* Test size decrease with zero extra. */
assert_zu_eq(xallocx(p, large0, 0, 0), large0, assert_zu_eq(xallocx(p, large0, 0, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, smallmax, 0, 0), large0, assert_zu_eq(xallocx(p, smallmax, 0, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large2, 0, 0), large2, assert_zu_eq(xallocx(p, large2, 0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size decrease with non-zero extra. */ /* Test size decrease with non-zero extra. */
assert_zu_eq(xallocx(p, large0, large2 - large0, 0), large2, assert_zu_eq(xallocx(p, large0, large2 - large0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large1, large2 - large1, 0), large2, assert_zu_eq(xallocx(p, large1, large2 - large1, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large0, large1 - large0, 0), large1, assert_zu_eq(xallocx(p, large0, large1 - large0, flags), large1,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, smallmax, large0 - smallmax, 0), large0, assert_zu_eq(xallocx(p, smallmax, large0 - smallmax, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large0, 0, 0), large0, assert_zu_eq(xallocx(p, large0, 0, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with zero extra. */ /* Test size increase with zero extra. */
assert_zu_eq(xallocx(p, large2, 0, 0), large2, assert_zu_eq(xallocx(p, large2, 0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, huge0, 0, 0), large2, assert_zu_eq(xallocx(p, huge0, 0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large0, 0, 0), large0, assert_zu_eq(xallocx(p, large0, 0, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with non-zero extra. */ /* Test size increase with non-zero extra. */
assert_zu_lt(xallocx(p, large0, huge0 - large0, 0), huge0, assert_zu_lt(xallocx(p, large0, huge0 - large0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large0, 0, 0), large0, assert_zu_eq(xallocx(p, large0, 0, flags), large0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with non-zero extra. */ /* Test size increase with non-zero extra. */
assert_zu_eq(xallocx(p, large0, large2 - large0, 0), large2, assert_zu_eq(xallocx(p, large0, large2 - large0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, large2, 0, 0), large2, assert_zu_eq(xallocx(p, large2, 0, flags), large2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size+extra overflow. */ /* Test size+extra overflow. */
assert_zu_lt(xallocx(p, large2, hugemax - large2 + 1, 0), huge0, assert_zu_lt(xallocx(p, large2, hugemax - large2 + 1, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
dallocx(p, 0); dallocx(p, flags);
} }
TEST_END TEST_END
TEST_BEGIN(test_extra_huge) TEST_BEGIN(test_extra_huge)
{ {
int flags = MALLOCX_ARENA(arena_ind());
size_t largemax, huge0, huge1, huge2, hugemax; size_t largemax, huge0, huge1, huge2, hugemax;
void *p; void *p;
@ -294,56 +315,56 @@ TEST_BEGIN(test_extra_huge)
huge2 = get_huge_size(2); huge2 = get_huge_size(2);
hugemax = get_huge_size(get_nhuge()-1); hugemax = get_huge_size(get_nhuge()-1);
p = mallocx(huge2, 0); p = mallocx(huge2, flags);
assert_ptr_not_null(p, "Unexpected mallocx() error"); assert_ptr_not_null(p, "Unexpected mallocx() error");
assert_zu_eq(xallocx(p, huge2, 0, 0), huge2, assert_zu_eq(xallocx(p, huge2, 0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size decrease with zero extra. */ /* Test size decrease with zero extra. */
assert_zu_ge(xallocx(p, huge0, 0, 0), huge0, assert_zu_ge(xallocx(p, huge0, 0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_ge(xallocx(p, largemax, 0, 0), huge0, assert_zu_ge(xallocx(p, largemax, 0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, huge2, 0, 0), huge2, assert_zu_eq(xallocx(p, huge2, 0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size decrease with non-zero extra. */ /* Test size decrease with non-zero extra. */
assert_zu_eq(xallocx(p, huge0, huge2 - huge0, 0), huge2, assert_zu_eq(xallocx(p, huge0, huge2 - huge0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, huge1, huge2 - huge1, 0), huge2, assert_zu_eq(xallocx(p, huge1, huge2 - huge1, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, huge0, huge1 - huge0, 0), huge1, assert_zu_eq(xallocx(p, huge0, huge1 - huge0, flags), huge1,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_ge(xallocx(p, largemax, huge0 - largemax, 0), huge0, assert_zu_ge(xallocx(p, largemax, huge0 - largemax, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_ge(xallocx(p, huge0, 0, 0), huge0, assert_zu_ge(xallocx(p, huge0, 0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with zero extra. */ /* Test size increase with zero extra. */
assert_zu_le(xallocx(p, huge2, 0, 0), huge2, assert_zu_le(xallocx(p, huge2, 0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_le(xallocx(p, hugemax+1, 0, 0), huge2, assert_zu_le(xallocx(p, hugemax+1, 0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_ge(xallocx(p, huge0, 0, 0), huge0, assert_zu_ge(xallocx(p, huge0, 0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with non-zero extra. */ /* Test size increase with non-zero extra. */
assert_zu_le(xallocx(p, huge0, SIZE_T_MAX - huge0, 0), hugemax, assert_zu_le(xallocx(p, huge0, SIZE_T_MAX - huge0, flags), hugemax,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_ge(xallocx(p, huge0, 0, 0), huge0, assert_zu_ge(xallocx(p, huge0, 0, flags), huge0,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size increase with non-zero extra. */ /* Test size increase with non-zero extra. */
assert_zu_le(xallocx(p, huge0, huge2 - huge0, 0), huge2, assert_zu_le(xallocx(p, huge0, huge2 - huge0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
assert_zu_eq(xallocx(p, huge2, 0, 0), huge2, assert_zu_eq(xallocx(p, huge2, 0, flags), huge2,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
/* Test size+extra overflow. */ /* Test size+extra overflow. */
assert_zu_le(xallocx(p, huge2, hugemax - huge2 + 1, 0), hugemax, assert_zu_le(xallocx(p, huge2, hugemax - huge2 + 1, flags), hugemax,
"Unexpected xallocx() behavior"); "Unexpected xallocx() behavior");
dallocx(p, 0); dallocx(p, flags);
} }
TEST_END TEST_END
@ -388,12 +409,13 @@ validate_fill(const void *p, uint8_t c, size_t offset, size_t len)
static void static void
test_zero(size_t szmin, size_t szmax) test_zero(size_t szmin, size_t szmax)
{ {
int flags = MALLOCX_ARENA(arena_ind()) | MALLOCX_ZERO;
size_t sz, nsz; size_t sz, nsz;
void *p; void *p;
#define FILL_BYTE 0x7aU #define FILL_BYTE 0x7aU
sz = szmax; sz = szmax;
p = mallocx(sz, MALLOCX_ZERO); p = mallocx(sz, flags);
assert_ptr_not_null(p, "Unexpected mallocx() error"); assert_ptr_not_null(p, "Unexpected mallocx() error");
assert_false(validate_fill(p, 0x00, 0, sz), "Memory not filled: sz=%zu", assert_false(validate_fill(p, 0x00, 0, sz), "Memory not filled: sz=%zu",
sz); sz);
@ -408,14 +430,14 @@ test_zero(size_t szmin, size_t szmax)
/* Shrink in place so that we can expect growing in place to succeed. */ /* Shrink in place so that we can expect growing in place to succeed. */
sz = szmin; sz = szmin;
assert_zu_eq(xallocx(p, sz, 0, MALLOCX_ZERO), sz, assert_zu_eq(xallocx(p, sz, 0, flags), sz,
"Unexpected xallocx() error"); "Unexpected xallocx() error");
assert_false(validate_fill(p, FILL_BYTE, 0, sz), assert_false(validate_fill(p, FILL_BYTE, 0, sz),
"Memory not filled: sz=%zu", sz); "Memory not filled: sz=%zu", sz);
for (sz = szmin; sz < szmax; sz = nsz) { for (sz = szmin; sz < szmax; sz = nsz) {
nsz = nallocx(sz+1, MALLOCX_ZERO); nsz = nallocx(sz+1, flags);
assert_zu_eq(xallocx(p, sz+1, 0, MALLOCX_ZERO), nsz, assert_zu_eq(xallocx(p, sz+1, 0, flags), nsz,
"Unexpected xallocx() failure"); "Unexpected xallocx() failure");
assert_false(validate_fill(p, FILL_BYTE, 0, sz), assert_false(validate_fill(p, FILL_BYTE, 0, sz),
"Memory not filled: sz=%zu", sz); "Memory not filled: sz=%zu", sz);
@ -426,7 +448,7 @@ test_zero(size_t szmin, size_t szmax)
"Memory not filled: nsz=%zu", nsz); "Memory not filled: nsz=%zu", nsz);
} }
dallocx(p, 0); dallocx(p, flags);
} }
TEST_BEGIN(test_zero_large) TEST_BEGIN(test_zero_large)