mirror of
https://github.com/jemalloc/jemalloc.git
synced 2026-07-24 22:03:07 +00:00
Change assert_* to expect_* in tests
```
grep -Irl assert_ test/ | xargs sed -i \
's/witness_assert/witness_do_not_replace/g';
grep -Irl assert_ test/ | xargs sed -i \
's/malloc_mutex_assert_owner/malloc_mutex_do_not_replace_owner/g';
grep -Ir assert_ test/ | grep -o "[_a-zA-Z]*assert_[_a-zA-Z]*" | \
grep -v "^assert_"; # confirm no output
grep -Irl assert_ test/ | xargs sed -i 's/assert_/expect_/g';
grep -Irl witness_do_not_replace test/ | xargs sed -i \
's/witness_do_not_replace/witness_assert/g';
grep -Irl malloc_mutex_do_not_replace_owner test/ | xargs sed -i \
's/malloc_mutex_do_not_replace_owner/malloc_mutex_assert_owner/g';
```
This commit is contained in:
@@ -11,37 +11,37 @@ TEST_BEGIN(huge_bind_thread) {
|
||||
size_t sz = sizeof(unsigned);
|
||||
|
||||
/* Bind to a manual arena. */
|
||||
assert_d_eq(mallctl("arenas.create", &arena1, &sz, NULL, 0), 0,
|
||||
expect_d_eq(mallctl("arenas.create", &arena1, &sz, NULL, 0), 0,
|
||||
"Failed to create arena");
|
||||
assert_d_eq(mallctl("thread.arena", NULL, NULL, &arena1,
|
||||
expect_d_eq(mallctl("thread.arena", NULL, NULL, &arena1,
|
||||
sizeof(arena1)), 0, "Fail to bind thread");
|
||||
|
||||
void *ptr = mallocx(HUGE_SZ, 0);
|
||||
assert_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
expect_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
sizeof(ptr)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_eq(arena1, arena2, "Wrong arena used after binding");
|
||||
expect_u_eq(arena1, arena2, "Wrong arena used after binding");
|
||||
dallocx(ptr, 0);
|
||||
|
||||
/* Switch back to arena 0. */
|
||||
test_skip_if(have_percpu_arena &&
|
||||
PERCPU_ARENA_ENABLED(opt_percpu_arena));
|
||||
arena2 = 0;
|
||||
assert_d_eq(mallctl("thread.arena", NULL, NULL, &arena2,
|
||||
expect_d_eq(mallctl("thread.arena", NULL, NULL, &arena2,
|
||||
sizeof(arena2)), 0, "Fail to bind thread");
|
||||
ptr = mallocx(SMALL_SZ, MALLOCX_TCACHE_NONE);
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
sizeof(ptr)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_eq(arena2, 0, "Wrong arena used after binding");
|
||||
expect_u_eq(arena2, 0, "Wrong arena used after binding");
|
||||
dallocx(ptr, MALLOCX_TCACHE_NONE);
|
||||
|
||||
/* Then huge allocation should use the huge arena. */
|
||||
ptr = mallocx(HUGE_SZ, 0);
|
||||
assert_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
expect_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
sizeof(ptr)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_ne(arena2, 0, "Wrong arena used after binding");
|
||||
assert_u_ne(arena1, arena2, "Wrong arena used after binding");
|
||||
expect_u_ne(arena2, 0, "Wrong arena used after binding");
|
||||
expect_u_ne(arena1, arena2, "Wrong arena used after binding");
|
||||
dallocx(ptr, 0);
|
||||
}
|
||||
TEST_END
|
||||
@@ -50,22 +50,22 @@ TEST_BEGIN(huge_mallocx) {
|
||||
unsigned arena1, arena2;
|
||||
size_t sz = sizeof(unsigned);
|
||||
|
||||
assert_d_eq(mallctl("arenas.create", &arena1, &sz, NULL, 0), 0,
|
||||
expect_d_eq(mallctl("arenas.create", &arena1, &sz, NULL, 0), 0,
|
||||
"Failed to create arena");
|
||||
void *huge = mallocx(HUGE_SZ, MALLOCX_ARENA(arena1));
|
||||
assert_ptr_not_null(huge, "Fail to allocate huge size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &huge,
|
||||
expect_ptr_not_null(huge, "Fail to allocate huge size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &huge,
|
||||
sizeof(huge)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_eq(arena1, arena2, "Wrong arena used for mallocx");
|
||||
expect_u_eq(arena1, arena2, "Wrong arena used for mallocx");
|
||||
dallocx(huge, MALLOCX_ARENA(arena1));
|
||||
|
||||
void *huge2 = mallocx(HUGE_SZ, 0);
|
||||
assert_ptr_not_null(huge, "Fail to allocate huge size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &huge2,
|
||||
expect_ptr_not_null(huge, "Fail to allocate huge size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &huge2,
|
||||
sizeof(huge2)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_ne(arena1, arena2,
|
||||
expect_u_ne(arena1, arena2,
|
||||
"Huge allocation should not come from the manual arena.");
|
||||
assert_u_ne(arena2, 0,
|
||||
expect_u_ne(arena2, 0,
|
||||
"Huge allocation should not come from the arena 0.");
|
||||
dallocx(huge2, 0);
|
||||
}
|
||||
@@ -75,25 +75,25 @@ TEST_BEGIN(huge_allocation) {
|
||||
unsigned arena1, arena2;
|
||||
|
||||
void *ptr = mallocx(HUGE_SZ, 0);
|
||||
assert_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
expect_ptr_not_null(ptr, "Fail to allocate huge size");
|
||||
size_t sz = sizeof(unsigned);
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena1, &sz, &ptr, sizeof(ptr)),
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena1, &sz, &ptr, sizeof(ptr)),
|
||||
0, "Unexpected mallctl() failure");
|
||||
assert_u_gt(arena1, 0, "Huge allocation should not come from arena 0");
|
||||
expect_u_gt(arena1, 0, "Huge allocation should not come from arena 0");
|
||||
dallocx(ptr, 0);
|
||||
|
||||
ptr = mallocx(HUGE_SZ >> 1, 0);
|
||||
assert_ptr_not_null(ptr, "Fail to allocate half huge size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
expect_ptr_not_null(ptr, "Fail to allocate half huge size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
sizeof(ptr)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_ne(arena1, arena2, "Wrong arena used for half huge");
|
||||
expect_u_ne(arena1, arena2, "Wrong arena used for half huge");
|
||||
dallocx(ptr, 0);
|
||||
|
||||
ptr = mallocx(SMALL_SZ, MALLOCX_TCACHE_NONE);
|
||||
assert_ptr_not_null(ptr, "Fail to allocate small size");
|
||||
assert_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
expect_ptr_not_null(ptr, "Fail to allocate small size");
|
||||
expect_d_eq(mallctl("arenas.lookup", &arena2, &sz, &ptr,
|
||||
sizeof(ptr)), 0, "Unexpected mallctl() failure");
|
||||
assert_u_ne(arena1, arena2,
|
||||
expect_u_ne(arena1, arena2,
|
||||
"Huge and small should be from different arenas");
|
||||
dallocx(ptr, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user