summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2014-03-30 18:22:23 (GMT)
committerJason Evans <jasone@canonware.com>2014-03-30 18:22:23 (GMT)
commitada8447cf6fb2c1f976b6311dade2e91026b3d83 (patch)
tree13e64377ef3575d3e7c1d1bebbcf9374acb77f81
parentab8c79fdafd6d1ee722c1277ef32c14c6e0c9dd3 (diff)
downloadjemalloc-ada8447cf6fb2c1f976b6311dade2e91026b3d83.zip
jemalloc-ada8447cf6fb2c1f976b6311dade2e91026b3d83.tar.gz
jemalloc-ada8447cf6fb2c1f976b6311dade2e91026b3d83.tar.bz2
Reduce maximum tested alignment.
Reduce maximum tested alignment from 2^29 to 2^25. Some systems may not have enough contiguous virtual memory to satisfy the larger alignment, but the smaller alignment is still adequate to test multi-chunk alignment.
-rw-r--r--test/integration/allocm.c3
-rw-r--r--test/integration/mallocx.c3
-rw-r--r--test/integration/rallocx.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/test/integration/allocm.c b/test/integration/allocm.c
index 66ecf86..7b4ea0c 100644
--- a/test/integration/allocm.c
+++ b/test/integration/allocm.c
@@ -1,8 +1,7 @@
#include "test/jemalloc_test.h"
#define CHUNK 0x400000
-/* #define MAXALIGN ((size_t)UINT64_C(0x80000000000)) */
-#define MAXALIGN ((size_t)0x2000000LU)
+#define MAXALIGN (((size_t)1) << 25)
#define NITER 4
TEST_BEGIN(test_basic)
diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c
index f37a74b..123e041 100644
--- a/test/integration/mallocx.c
+++ b/test/integration/mallocx.c
@@ -1,8 +1,7 @@
#include "test/jemalloc_test.h"
#define CHUNK 0x400000
-/* #define MAXALIGN ((size_t)UINT64_C(0x80000000000)) */
-#define MAXALIGN ((size_t)0x2000000LU)
+#define MAXALIGN (((size_t)1) << 25)
#define NITER 4
TEST_BEGIN(test_basic)
diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c
index b4b6780..ee21aed 100644
--- a/test/integration/rallocx.c
+++ b/test/integration/rallocx.c
@@ -112,7 +112,7 @@ TEST_BEGIN(test_align)
{
void *p, *q;
size_t align;
-#define MAX_ALIGN (ZU(1) << 29)
+#define MAX_ALIGN (ZU(1) << 25)
align = ZU(1);
p = mallocx(1, MALLOCX_ALIGN(align));
@@ -137,7 +137,7 @@ TEST_BEGIN(test_lg_align_and_zero)
{
void *p, *q;
size_t lg_align, sz;
-#define MAX_LG_ALIGN 29
+#define MAX_LG_ALIGN 25
#define MAX_VALIDATE (ZU(1) << 22)
lg_align = ZU(0);