Loading...
--- libmalloc/libmalloc-715.100.22/tests/pgm_zone_api.c
+++ libmalloc/libmalloc-409.40.6/tests/pgm_zone_api.c
@@ -19,12 +19,9 @@
return should_sample_counter_ret_value;
}
+#include "../src/has_section.c"
#include "../src/pgm_malloc.c"
-// Dependencies
-#include "../src/has_section.c"
-#include "../src/malloc_common.c"
#include "../src/stack_trace.c"
-#include "../src/wrapper_zones.c"
// Stub out cross-file dependencies.
void malloc_report(uint32_t flags, const char *fmt, ...) { }
@@ -32,7 +29,7 @@
static malloc_zone_t wrapped_zone;
static pgm_zone_t *zone;
-static const size_t size = 5;
+static size_t size = 5;
#define CALL_(func, args...) zone->malloc_zone.func(args)
#define CALL(func, args...) CALL_(func, (malloc_zone_t *)zone, ## args)
@@ -56,56 +53,35 @@
setup(void)
{
T_ATEND(teardown);
-
- wrapped_zone.version = 16;
+ // rdar://74948496 ([PGM] Drop all requirements for wrapped_zone)
+ wrapped_zone.version = 6;
+ wrapped_zone.batch_malloc = malloc_default_zone()->batch_malloc;
+ wrapped_zone.batch_free = malloc_default_zone()->batch_free;
+ wrapped_zone.memalign = malloc_default_zone()->memalign;
+ wrapped_zone.free_definite_size = malloc_default_zone()->free_definite_size;
wrapped_zone.calloc = malloc_default_zone()->calloc;
zone = (pgm_zone_t *)pgm_create_zone(&wrapped_zone);
wrapped_zone.calloc = NULL;
- wrapped_zone.version = 0;
-}
-
-T_DECL(optional_apis, "Restrict zone API to what is supported by wrapped zone", T_META_TAG_VM_PREFERRED)
-{
- setup();
-
- malloc_zone_t *z = &zone->malloc_zone;
-
- // Always supported
- T_EXPECT_NOTNULL(z->batch_malloc, NULL);
- T_EXPECT_NOTNULL(z->batch_free, NULL);
- T_EXPECT_NOTNULL(z->pressure_relief, NULL);
-
- // Never supported
- T_EXPECT_NULL(z->try_free_default, NULL);
-
- // Supported if wrapped zone has it
- T_EXPECT_NULL(z->memalign, NULL);
- T_EXPECT_NULL(z->malloc_type_memalign, NULL);
- T_EXPECT_NULL(z->free_definite_size, NULL);
- T_EXPECT_NULL(z->claimed_address, NULL);
- T_EXPECT_NULL(z->malloc_type_malloc_with_options, NULL);
-}
-
-static size_t wrapped_zone_malloc_expected_size = size;
-static uint32_t wrapped_zone_malloc_call_count;
+ wrapped_zone.free_definite_size = NULL;
+ wrapped_zone.memalign = NULL;
+ wrapped_zone.batch_free = NULL;
+ wrapped_zone.batch_malloc = NULL;
+}
+
+static uint8_t *wrapped_zone_malloc_ret_value;
static void *
-wrapped_zone_malloc(malloc_zone_t *zone, size_t size)
-{
- T_EXPECT_EQ(size, wrapped_zone_malloc_expected_size, "malloc(size)");
- return (void *)(uintptr_t)++wrapped_zone_malloc_call_count;
+wrapped_zone_malloc(malloc_zone_t *zone, size_t size) {
+ return ++wrapped_zone_malloc_ret_value;
}
T_DECL(delegate_unsampled, "delegation of unsampled allocations",
- T_META_ENVVAR("MallocProbGuardAllocations=1"),
- T_META_TAG_VM_PREFERRED)
+ T_META_ENVVAR("MallocProbGuardAllocations=1"))
{
setup();
wrapped_zone.malloc = wrapped_zone_malloc;
- wrapped_zone_malloc_expected_size = PAGE_SIZE + 1;
T_EXPECT_EQ(CALL(malloc, PAGE_SIZE + 1), (void *)1, "requested size > page size");
T_EXPECT_EQ(should_sample_counter_call_count, 0, "bad size; no call to should_sample_counter()");
- wrapped_zone_malloc_expected_size = size;
should_sample_counter_ret_value = FALSE;
T_EXPECT_EQ(CALL(malloc, size), (void *)2, "not sampled");
@@ -118,17 +94,15 @@
T_EXPECT_EQ(should_sample_counter_call_count, 2, "zone full; no call to should_sample_counter()");
}
-static void *wrapped_zone_free_expected_ptrs[3];
static uint32_t wrapped_zone_free_call_count;
static void
wrapped_zone_free(malloc_zone_t *zone, void *ptr)
{
- T_QUIET; T_ASSERT_LT(wrapped_zone_free_call_count, 3, NULL);
- T_EXPECT_EQ(ptr, wrapped_zone_free_expected_ptrs[wrapped_zone_free_call_count], "free(ptr)");
+ T_EXPECT_EQ(ptr, (void *)1337, "free(): ptr");
wrapped_zone_free_call_count++;
}
-T_DECL(delegate_unguarded, "delegation of unguarded deallocations", T_META_TAG_VM_PREFERRED)
+T_DECL(delegate_unguarded, "delegation of unguarded deallocations")
{
setup();
wrapped_zone.free = wrapped_zone_free;
@@ -141,12 +115,11 @@
CALL(free, p1);
T_EXPECT_EQ(wrapped_zone_free_call_count, 0, "handle guarded");
- wrapped_zone_free_expected_ptrs[0] = p2;
CALL(free, p2);
T_EXPECT_EQ(wrapped_zone_free_call_count, 1, "delegate unguarded");
}
-T_DECL(size, "size is rounded up to multiple of 16", T_META_TAG_VM_PREFERRED)
+T_DECL(size, "size is rounded up to multiple of 16")
{
setup();
size_t requested_sizes[] = {0, 1, 16, 17, 32, 33, 48, 49};
@@ -166,11 +139,9 @@
return ((uintptr_t)ptr % alignment) == 0;
}
-T_DECL(alignment, "alignments", T_META_TAG_VM_PREFERRED)
-{
- wrapped_zone.memalign = malloc_default_zone()->memalign;
- setup();
- wrapped_zone.memalign = NULL;
+T_DECL(alignment, "alignments")
+{
+ setup();
T_EXPECT_TRUE(is_aligned(CALL(malloc, size), 16), "malloc(): 16-byte aligned");
T_EXPECT_TRUE(is_aligned(CALL(valloc, size), PAGE_SIZE), "valloc(): page size aligned");
@@ -187,12 +158,14 @@
return ++wrapped_zone_memalign_ret_value;
}
-T_DECL(memalign_invalid_alignment, "memalign delegates for alignment greater than page size", T_META_TAG_VM_PREFERRED)
-{
+T_DECL(memalign_invalid_alignment, "memalign delegates for invalid alignment")
+{
+ setup();
wrapped_zone.memalign = wrapped_zone_memalign;
- setup();
T_EXPECT_EQ(CALL(memalign, 2 * PAGE_SIZE, size), (void *)1, "alignment > page size");
+ T_EXPECT_EQ(CALL(memalign, 32+16, size), (void *)2, "alignment not a power of 2");
+ T_EXPECT_EQ(CALL(memalign, sizeof(void *) / 2, size), (void *)3, "alignment < sizeof(void *)");
}
static void *
@@ -201,7 +174,7 @@
return (void *)7;
}
-T_DECL(calloc_overflow, "calloc delegates on overflow", T_META_TAG_VM_PREFERRED)
+T_DECL(calloc_overflow, "calloc delegates on overflow")
{
setup();
wrapped_zone.calloc = wrapped_zone_calloc;
@@ -226,8 +199,7 @@
T_DECL(calloc_zeroed_memory, "calloc provides zeroed memory",
T_META_ENVVAR("MallocProbGuardSlots=2"),
T_META_ENVVAR("MallocProbGuardMetadata=2"),
- T_META_ENVVAR("MallocProbGuardAllocations=1"),
- T_META_TAG_VM_PREFERRED)
+ T_META_ENVVAR("MallocProbGuardAllocations=1"))
{
setup();
@@ -246,7 +218,7 @@
T_EXPECT_TRUE(is_zeroed_page(ptr3), "zeroed page");
}
-T_DECL(realloc_null_pointer, "realloc forwards to malloc for null pointers", T_META_TAG_VM_PREFERRED)
+T_DECL(realloc_null_pointer, "realloc forwards to malloc for null pointers")
{
setup();
wrapped_zone.malloc = wrapped_zone_malloc;
@@ -262,8 +234,7 @@
return (void *)9;
}
-T_DECL(realloc_unguarded_and_unsampled, "realloc only delegates for old-unguarded and new-unsampled combination",
- T_META_TAG_VM_PREFERRED)
+T_DECL(realloc_unguarded_and_unsampled, "realloc only delegates for old-unguarded and new-unsampled combination")
{
setup();
wrapped_zone.realloc = wrapped_zone_realloc;
@@ -272,39 +243,52 @@
T_EXPECT_EQ(CALL(realloc, (void *)8, size), (void *)9, "delegated call");
}
+static void **wrapped_zone_batch_malloc_expected_results;
+static uint32_t wrapped_zone_batch_malloc_call_count;
+static unsigned
+wrapped_zone_batch_malloc(malloc_zone_t *zone, size_t size, void **results, unsigned count)
+{
+ T_EXPECT_EQ(results, wrapped_zone_batch_malloc_expected_results, "batch_malloc(): results");
+ T_EXPECT_EQ(count, 1, "batch_malloc(): count");
+ wrapped_zone_batch_malloc_call_count++;
+ return 10;
+}
+
T_DECL(batch_malloc, "batch_malloc implementation",
- T_META_ENVVAR("MallocProbGuardAllocations=2"),
- T_META_TAG_VM_PREFERRED)
-{
- setup();
- wrapped_zone.malloc = wrapped_zone_malloc;
-
- T_EXPECT_EQ(CALL(batch_malloc, size, NULL, /*num_requested=*/0), 0, "zero count");
+ T_META_ENVVAR("MallocProbGuardAllocations=2"))
+{
+ setup();
+ wrapped_zone.batch_malloc = wrapped_zone_batch_malloc;
+
+ T_EXPECT_EQ(CALL(batch_malloc, size, NULL, /*count=*/0), 0, "zero count");
T_EXPECT_EQ(should_sample_counter_call_count, 0, "early return for zero count");
void *results[3];
- T_EXPECT_EQ(CALL(batch_malloc, size, results, 3), 3, "3 allocations");
- T_EXPECT_EQ(should_sample_counter_call_count, 2, "2 PGM allocations, then quarantine is full");
- T_EXPECT_EQ(wrapped_zone_malloc_call_count, 1, "3rd allocation from wrapped zone");
- T_EXPECT_TRUE(is_guarded(zone, (vm_address_t)results[0]), "PGM allocation");
- T_EXPECT_TRUE(is_guarded(zone, (vm_address_t)results[1]), "PGM allocation");
- T_EXPECT_EQ(results[2], (void *)1, "Wrapped zone allocation");
-}
-
-T_DECL(batch_free, "batch_free implementation", T_META_TAG_VM_PREFERRED)
-{
- setup();
- wrapped_zone.free = wrapped_zone_free;
+ wrapped_zone_batch_malloc_expected_results = &results[2];
+ T_EXPECT_EQ(CALL(batch_malloc, size, results, 3), 12, "return sampled plus delegated");
+ T_EXPECT_EQ(should_sample_counter_call_count, 3, "determine sample count");
+ T_EXPECT_EQ(wrapped_zone_batch_malloc_call_count, 1, "delegate unsampled");
+}
+
+static uint32_t wrapped_zone_batch_free_call_count;
+static void
+wrapped_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned count)
+{
+ T_EXPECT_EQ(count, 3, "batch_free(): count");
+ T_EXPECT_EQ(to_be_freed[0], (void *)1, "batch_free(): to_be_freed[0]");
+ T_EXPECT_EQ(to_be_freed[1], NULL, "batch_free(): to_be_freed[1]");
+ T_EXPECT_EQ(to_be_freed[2], (void *)3, "batch_free(): to_be_freed[2]");
+ wrapped_zone_batch_free_call_count++;
+}
+
+T_DECL(batch_free, "batch_free implementation")
+{
+ setup();
+ wrapped_zone.batch_free = wrapped_zone_batch_free;
void *to_be_freed[] = {(void *)1, CALL(malloc, size), (void *)3};
- // Freed in reverse order
- wrapped_zone_free_expected_ptrs[0] = (void *)3;
- wrapped_zone_free_expected_ptrs[1] = (void *)1;
-
- T_EXPECT_EQ(zone->num_allocations, 1, "1 PGM allocation");
CALL(batch_free, to_be_freed, 3);
- T_EXPECT_EQ(zone->num_allocations, 0, "Freed the PGM allocation");
- T_EXPECT_EQ(wrapped_zone_free_call_count, 2, "delegate unguarded");
+ T_EXPECT_EQ(wrapped_zone_batch_free_call_count, 1, "delegate unguarded");
}
static vm_range_t expected_ranges[2];
@@ -323,7 +307,7 @@
T_QUIET; T_EXPECT_EQ(count, 1, NULL);
}
-T_DECL(introspection_enumerator, "In-process block enumeration", T_META_TAG_VM_PREFERRED)
+T_DECL(introspection_enumerator, "In-process block enumeration")
{
setup();
expected_ranges[0] = (vm_range_t){(vm_address_t)CALL(malloc, 7), 16};