diff options
| author | Jason Evans <je@fb.com> | 2013-12-16 21:37:21 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2013-12-16 21:37:21 (GMT) |
| commit | e935c07e0066e5c7b8ae51e68ebcc4321eabcb7c (patch) | |
| tree | 8586f8284aaf3a06271daff93bb8eb6bbba431b6 | |
| parent | 5fbad0902b845b1a6b311994468d0b9962e4fd30 (diff) | |
| download | jemalloc-e935c07e0066e5c7b8ae51e68ebcc4321eabcb7c.zip jemalloc-e935c07e0066e5c7b8ae51e68ebcc4321eabcb7c.tar.gz jemalloc-e935c07e0066e5c7b8ae51e68ebcc4321eabcb7c.tar.bz2 | |
Add rallocx() test of both alignment and zeroing.
| -rw-r--r-- | test/integration/rallocx.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c index 438e9a5..b4b6780 100644 --- a/test/integration/rallocx.c +++ b/test/integration/rallocx.c @@ -133,27 +133,39 @@ TEST_BEGIN(test_align) } TEST_END -TEST_BEGIN(test_lg_align) +TEST_BEGIN(test_lg_align_and_zero) { void *p, *q; - size_t lg_align; + size_t lg_align, sz; #define MAX_LG_ALIGN 29 +#define MAX_VALIDATE (ZU(1) << 22) lg_align = ZU(0); - p = mallocx(1, MALLOCX_LG_ALIGN(lg_align)); + p = mallocx(1, MALLOCX_LG_ALIGN(lg_align)|MALLOCX_ZERO); assert_ptr_not_null(p, "Unexpected mallocx() error"); for (lg_align++; lg_align <= MAX_LG_ALIGN; lg_align++) { - q = rallocx(p, 1, MALLOCX_LG_ALIGN(lg_align)); + q = rallocx(p, 1, MALLOCX_LG_ALIGN(lg_align)|MALLOCX_ZERO); assert_ptr_not_null(q, "Unexpected rallocx() error for lg_align=%zu", lg_align); assert_ptr_null( (void *)((uintptr_t)q & ((ZU(1) << lg_align)-1)), "%p inadequately aligned for lg_align=%zu", q, lg_align); + sz = sallocx(q, 0); + if ((sz << 1) <= MAX_VALIDATE) { + assert_false(validate_fill(q, 0, 0, sz), + "Expected zeroed memory"); + } else { + assert_false(validate_fill(q, 0, 0, MAX_VALIDATE), + "Expected zeroed memory"); + assert_false(validate_fill(q+sz-MAX_VALIDATE, 0, 0, + MAX_VALIDATE), "Expected zeroed memory"); + } p = q; } dallocx(p, 0); +#undef MAX_VALIDATE #undef MAX_LG_ALIGN } TEST_END @@ -166,5 +178,5 @@ main(void) test_grow_and_shrink, test_zero, test_align, - test_lg_align)); + test_lg_align_and_zero)); } |