diff options
| author | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2014-03-31 16:33:19 (GMT) |
| commit | 46c0af68bd248b04df75e4f92d5fb804c3d75340 (patch) | |
| tree | 28a1ac21474d5f3d55812986c4c75a8bb734257b /test/integration | |
| parent | 7709a64c59daf0b1f938be49472fcc499e1bd136 (diff) | |
| parent | 8a26eaca7f4c95771ecbf096caeeba14fbe1122f (diff) | |
| download | jemalloc-3.6.0.zip jemalloc-3.6.0.tar.gz jemalloc-3.6.0.tar.bz2 | |
Merge branch 'dev'3.6.0
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/MALLOCX_ARENA.c (renamed from test/integration/ALLOCM_ARENA.c) | 8 | ||||
| -rw-r--r-- | test/integration/allocm.c | 3 | ||||
| -rw-r--r-- | test/integration/mallocx.c | 3 | ||||
| -rw-r--r-- | test/integration/rallocx.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/test/integration/ALLOCM_ARENA.c b/test/integration/MALLOCX_ARENA.c index 5bf3c4a..71cf6f2 100644 --- a/test/integration/ALLOCM_ARENA.c +++ b/test/integration/MALLOCX_ARENA.c @@ -8,7 +8,7 @@ thd_start(void *arg) unsigned thread_ind = (unsigned)(uintptr_t)arg; unsigned arena_ind; void *p; - size_t rsz, sz; + size_t sz; sz = sizeof(arena_ind); assert_d_eq(mallctl("arenas.extend", &arena_ind, &sz, NULL, 0), 0, @@ -27,9 +27,9 @@ thd_start(void *arg) sizeof(const char *)), 0, "Error in mallctlbymib()"); } - assert_d_eq(allocm(&p, &rsz, 1, ALLOCM_ARENA(arena_ind)), - ALLOCM_SUCCESS, "Unexpected allocm() error"); - dallocm(p, 0); + p = mallocx(1, MALLOCX_ARENA(arena_ind)); + assert_ptr_not_null(p, "Unexpected mallocx() error"); + dallocx(p, 0); return (NULL); } 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); |