From 4f05bdc891635170d20a2171cc74e6c86e36a98a Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Sun, 14 Dec 2025 23:37:20 +0800 Subject: [PATCH] Replace `CHECK_MM` with `TEST_SUCC` --- test/src/apps/mmap/mmap_and_mremap.c | 63 ++++++++++++++-------------- test/src/apps/mmap/mmap_vmrss.c | 10 ++--- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/test/src/apps/mmap/mmap_and_mremap.c b/test/src/apps/mmap/mmap_and_mremap.c index 08fdad65d..2811fed30 100644 --- a/test/src/apps/mmap/mmap_and_mremap.c +++ b/test/src/apps/mmap/mmap_and_mremap.c @@ -61,23 +61,21 @@ END_TEST() const char *content = "kjfkljk*wigo&h"; -#define CHECK_MM(func) CHECK_WITH(func, _ret != MAP_FAILED) - FN_TEST(mmap_and_mremap) { - char *addr = CHECK_MM(mmap(NULL, 3 * PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); + char *addr = TEST_SUCC(mmap(NULL, 3 * PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); TEST_SUCC(munmap(addr, 3 * PAGE_SIZE)); - addr = CHECK_MM(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); + addr = TEST_SUCC(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); strcpy(addr, content); - char *addr2 = CHECK_MM( + char *addr2 = TEST_SUCC( mmap(addr + 2 * PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); - char *new_addr = CHECK_MM( + char *new_addr = TEST_SUCC( mremap(addr, PAGE_SIZE, 3 * PAGE_SIZE, MREMAP_MAYMOVE)); // Ensure that the mapping at the old address does not exist any more. @@ -96,8 +94,9 @@ END_TEST() FN_TEST(mmap_and_mremap_fixed) { - char *addr1 = CHECK_MM(mmap(NULL, PAGE_SIZE * 2, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); + char *addr1 = + TEST_SUCC(mmap(NULL, PAGE_SIZE * 2, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); strcpy(addr1, content); // Unmap a target region to ensure we know it's free @@ -122,21 +121,21 @@ END_TEST() FN_TEST(mmap_and_mremap_auto_merge_anon) { - char *addr = CHECK_MM(mmap(NULL, 6 * PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); + char *addr = TEST_SUCC(mmap(NULL, 6 * PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); TEST_SUCC(munmap(addr, 6 * PAGE_SIZE)); - CHECK_MM(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); + TEST_SUCC(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); strcpy(addr, content); - CHECK_MM(mmap(addr + 2 * PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); - CHECK_MM(mmap(addr + PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); + TEST_SUCC(mmap(addr + 2 * PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); + TEST_SUCC(mmap(addr + PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0)); - char *new_addr = CHECK_MM(mremap(addr, 3 * PAGE_SIZE, 3 * PAGE_SIZE, - MREMAP_MAYMOVE | MREMAP_FIXED, - addr + 3 * PAGE_SIZE)); + char *new_addr = TEST_SUCC(mremap(addr, 3 * PAGE_SIZE, 3 * PAGE_SIZE, + MREMAP_MAYMOVE | MREMAP_FIXED, + addr + 3 * PAGE_SIZE)); TEST_RES(strcmp(new_addr, content), _ret == 0); TEST_SUCC(munmap(new_addr, 3 * PAGE_SIZE)); } @@ -148,21 +147,21 @@ FN_TEST(mmap_and_mremap_auto_merge_file) int fd = TEST_SUCC(open(filename, O_CREAT | O_RDWR, 0600)); TEST_SUCC(ftruncate(fd, 6 * PAGE_SIZE)); - char *addr = CHECK_MM(mmap(NULL, 6 * PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE, fd, 0)); + char *addr = TEST_SUCC(mmap(NULL, 6 * PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE, fd, 0)); TEST_SUCC(munmap(addr, 6 * PAGE_SIZE)); - CHECK_MM(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0)); + TEST_SUCC(mmap(addr, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0)); strcpy(addr, content); - CHECK_MM(mmap(addr + 2 * PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 2 * PAGE_SIZE)); - CHECK_MM(mmap(addr + PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, PAGE_SIZE)); + TEST_SUCC(mmap(addr + 2 * PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 2 * PAGE_SIZE)); + TEST_SUCC(mmap(addr + PAGE_SIZE, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, PAGE_SIZE)); - char *new_addr = CHECK_MM(mremap(addr, 3 * PAGE_SIZE, 3 * PAGE_SIZE, - MREMAP_MAYMOVE | MREMAP_FIXED, - addr + 3 * PAGE_SIZE)); + char *new_addr = TEST_SUCC(mremap(addr, 3 * PAGE_SIZE, 3 * PAGE_SIZE, + MREMAP_MAYMOVE | MREMAP_FIXED, + addr + 3 * PAGE_SIZE)); TEST_RES(strcmp(new_addr, content), _ret == 0); TEST_SUCC(munmap(new_addr, 3 * PAGE_SIZE)); diff --git a/test/src/apps/mmap/mmap_vmrss.c b/test/src/apps/mmap/mmap_vmrss.c index 80a6feaf1..0b7f8cde2 100644 --- a/test/src/apps/mmap/mmap_vmrss.c +++ b/test/src/apps/mmap/mmap_vmrss.c @@ -68,12 +68,10 @@ long get_vm_rss_kb(rss_type type) return rss_kb; } -#define CHECK_MM(func) CHECK_WITH(func, _ret != MAP_FAILED) - FN_TEST(rss_anon) { - void *mem = CHECK_MM(mmap(NULL, TOTAL_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); + void *mem = TEST_SUCC(mmap(NULL, TOTAL_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)); // The first call to `TEST_SUCC` and `get_vm_rss_kb()` may trigger // lazy mapping of additional pages, such as shared libraries or files. @@ -120,8 +118,8 @@ FN_TEST(rss_file) long rss_file_before = TEST_SUCC(get_vm_rss_kb(file)); long rss_before = TEST_SUCC(get_vm_rss_kb(total)); - void *mem = - CHECK_MM(mmap(NULL, TOTAL_SIZE, PROT_READ, MAP_PRIVATE, fd, 0)); + void *mem = TEST_SUCC( + mmap(NULL, TOTAL_SIZE, PROT_READ, MAP_PRIVATE, fd, 0)); // Trigger page faults for (int i = 0; i < NUM_PAGES; ++i) {