diff options
author | antirez <antirez@gmail.com> | 2017-04-22 13:12:42 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2017-04-22 13:17:07 +0200 |
commit | e3b8492e83822aa618d084732f8ab997bf41d7f3 (patch) | |
tree | c1ed5fc9cb15c3a85b6202ad16bde4fe8f012b4b /deps/jemalloc/test/integration/posix_memalign.c | |
parent | 238cebdd5eb0fd0d8f2db87d895a007bc492dcdb (diff) | |
download | redis-e3b8492e83822aa618d084732f8ab997bf41d7f3.tar.gz |
Revert "Jemalloc updated to 4.4.0."
This reverts commit 36c1acc222d29e6e2dc9fc25362e4faa471111bd.
Diffstat (limited to 'deps/jemalloc/test/integration/posix_memalign.c')
-rw-r--r-- | deps/jemalloc/test/integration/posix_memalign.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/deps/jemalloc/test/integration/posix_memalign.c b/deps/jemalloc/test/integration/posix_memalign.c index e22e10200..19741c6cb 100644 --- a/deps/jemalloc/test/integration/posix_memalign.c +++ b/deps/jemalloc/test/integration/posix_memalign.c @@ -1,20 +1,9 @@ #include "test/jemalloc_test.h" #define CHUNK 0x400000 -#define MAXALIGN (((size_t)1) << 23) - -/* - * On systems which can't merge extents, tests that call this function generate - * a lot of dirty memory very quickly. Purging between cycles mitigates - * potential OOM on e.g. 32-bit Windows. - */ -static void -purge(void) -{ - - assert_d_eq(mallctl("arena.0.purge", NULL, NULL, NULL, 0), 0, - "Unexpected mallctl error"); -} +/* #define MAXALIGN ((size_t)UINT64_C(0x80000000000)) */ +#define MAXALIGN ((size_t)0x2000000LU) +#define NITER 4 TEST_BEGIN(test_alignment_errors) { @@ -77,7 +66,6 @@ TEST_END TEST_BEGIN(test_alignment_and_size) { -#define NITER 4 size_t alignment, size, total; unsigned i; int err; @@ -116,9 +104,7 @@ TEST_BEGIN(test_alignment_and_size) } } } - purge(); } -#undef NITER } TEST_END |