Fix test_vest to correctly handle mock_defrag

ranshid · ranshid · commit cd89708f918d · 2025-08-06T11:14:56.000+03:00
Signed-off-by: Ran Shidlansik &lt;ranshid@amazon.com&gt;
diff --git a/src/unit/test_vset.c b/src/unit/test_vset.c
@@ -401,7 +401,7 @@ int expire_mock_entries(vset *set, mstime_t now) {
 }
 
 void *mock_defragfn(void *ptr) {
-    size_t size = zmalloc_size(ptr);
+    size_t size = zmalloc_usable_size(ptr);
     void *newptr = zmalloc(size);
     memcpy(newptr, ptr, size);
     zfree(ptr);
diff --git a/src/zmalloc.h b/src/zmalloc.h
@@ -58,7 +58,7 @@
 #error "Newer version of jemalloc required"
 #endif
 
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && !defined(NO_MALLOC_USABLE_SIZE)
 #include <malloc/malloc.h>
 #define HAVE_MALLOC_SIZE 1
 #define zmalloc_size(p) malloc_size(p)

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ int expire_mock_entries(vset *set, mstime_t now) {`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`void mock_defragfn(void ptr) {`
`404`		`- size_t size = zmalloc_size(ptr);`
	`404`	`+ size_t size = zmalloc_usable_size(ptr);`
`405`	`405`	`void *newptr = zmalloc(size);`
`406`	`406`	`memcpy(newptr, ptr, size);`
`407`	`407`	`zfree(ptr);`