Loading...
--- libmalloc/libmalloc-374.60.3/tests/magazine_small_test.c
+++ libmalloc/libmalloc-283/tests/magazine_small_test.c
@@ -11,21 +11,20 @@
#include "../src/magazine_small.c"
#include "magazine_testing.h"
-// Stubs
-bool aggressive_madvise_enabled = DEFAULT_AGGRESSIVE_MADVISE_ENABLED;
-
T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
static inline void
-small_test_rack_setup(rack_t *rack)
+test_rack_setup(rack_t *rack)
{
- test_rack_setup(rack, RACK_TYPE_SMALL);
+ memset(rack, 'a', sizeof(rack));
+ rack_init(rack, RACK_TYPE_SMALL, 1, 0);
+ T_QUIET; T_ASSERT_NOTNULL(rack->magazines, "magazine initialisation");
}
T_DECL(basic_small_alloc, "small rack init and alloc")
{
struct rack_s rack;
- small_test_rack_setup(&rack);
+ test_rack_setup(&rack);
void *ptr = small_malloc_should_clear(&rack, SMALL_MSIZE_FOR_BYTES(512), false);
T_ASSERT_NOTNULL(ptr, "allocation");
@@ -40,7 +39,7 @@
T_DECL(basic_small_teardown, "small rack init, alloc, teardown")
{
struct rack_s rack;
- small_test_rack_setup(&rack);
+ test_rack_setup(&rack);
void *ptr = small_malloc_should_clear(&rack, TINY_MSIZE_FOR_BYTES(512), false);
T_ASSERT_NOTNULL(ptr, "allocation");
@@ -60,7 +59,7 @@
T_DECL(basic_small_free, "small free")
{
struct rack_s rack;
- small_test_rack_setup(&rack);
+ test_rack_setup(&rack);
void *ptr = small_malloc_should_clear(&rack, SMALL_MSIZE_FOR_BYTES(512), false);
T_ASSERT_NOTNULL(ptr, "allocation");
@@ -75,7 +74,7 @@
T_DECL(basic_small_shrink, "small rack shrink")
{
struct rack_s rack;
- small_test_rack_setup(&rack);
+ test_rack_setup(&rack);
void *ptr = small_malloc_should_clear(&rack, SMALL_MSIZE_FOR_BYTES(1024), false);
T_ASSERT_NOTNULL(ptr, "allocation");
@@ -92,7 +91,7 @@
T_DECL(basic_small_realloc_in_place, "small rack realloc in place")
{
struct rack_s rack;
- small_test_rack_setup(&rack);
+ test_rack_setup(&rack);
// Allocate two blocks and free the second, then try to realloc() the first.
// This should extend in-place using the one-level death row cache that's