Made memory leak checking compile only on testing

deadlightreal · Morcules · commit fa0c1242b00f · 2025-12-06T19:33:46.000+01:00
diff --git a/build/build_for_testing.sh b/build/build_for_testing.sh
@@ -1,2 +1,2 @@
-cmake ../src -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread -DSWIFT_NET_INTERNAL_TESTING
+cmake ../src -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread -DSWIFT_NET_INTERNAL_TESTING=ON
 make -B -j8
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,8 +48,16 @@ else()
 endif()
 
 add_library(swiftnet STATIC ${SOURCE_FILES})
-target_compile_options(swiftnet PRIVATE -O0)
-target_link_options(swiftnet PRIVATE -O0)
+
+if (SWIFT_NET_INTERNAL_TESTING)
+    add_compile_definitions(SWIFT_NET_INTERNAL_TESTING)
+
+    target_compile_options(swiftnet PRIVATE -O0)
+    target_link_options(swiftnet PRIVATE -O0)
+else()
+    target_compile_options(swiftnet PRIVATE -O3)
+    target_link_options(swiftnet PRIVATE -O3)
+endif()
 
 if(DEFINED ENV{VCPKG_ROOT} AND DEFINED CMAKE_VCPKG_TARGET_TRIPLET)
     set(VCPKG_INCLUDE_DIR "$ENV{VCPKG_ROOT}/installed/${CMAKE_VCPKG_TARGET_TRIPLET}/include")
diff --git a/src/cleanup.c b/src/cleanup.c
@@ -38,5 +38,7 @@ void swiftnet_cleanup() {
 
     allocator_destroy(&listener_memory_allocator);
 
+    #ifdef SWIFT_NET_INTERNAL_TESTING
     printf("Bytes leaked: %d\nItems leaked: %d\n", bytes_leaked, items_leaked);
+    #endif
 }
diff --git a/src/initialize_swift_net.c b/src/initialize_swift_net.c
@@ -11,6 +11,9 @@
 
 #ifdef SWIFT_NET_DEBUG
     struct SwiftNetDebugger debugger = {.flags = 0};
+#endif
+
+#ifdef SWIFT_NET_INTERNAL_TESTING
     uint32_t bytes_leaked = 0;
     uint32_t items_leaked = 0;
 #endif
diff --git a/src/internal/datatype_allocator.c b/src/internal/datatype_allocator.c
@@ -10,6 +10,7 @@ static inline void free_stack_lock(struct SwiftNetMemoryAllocatorStack* const st
     atomic_store_explicit(&stack->owner, ALLOCATOR_STACK_FREE, memory_order_release);
 }
 
+#ifdef SWIFT_NET_INTERNAL_TESTING
 static inline void unlock_ptr_status(struct SwiftNetMemoryAllocatorStack* const stack) {
     atomic_store_explicit(&stack->accessing_ptr_status, false, memory_order_release);
 }
@@ -27,6 +28,7 @@ static inline void lock_ptr_status(struct SwiftNetMemoryAllocatorStack* const st
         target = false;
     }
 }
+#endif
 
 struct SwiftNetMemoryAllocatorStack* const find_free_pointer_stack(const struct SwiftNetMemoryAllocator* const allocator) {
     for (struct SwiftNetMemoryAllocatorStack* current_stack = atomic_load(&allocator->data.first_item); current_stack != NULL; current_stack = atomic_load_explicit(&current_stack->next, memory_order_acquire)) {
@@ -111,7 +113,7 @@ struct SwiftNetMemoryAllocator allocator_create(const uint32_t item_size, const
 
     atomic_store_explicit(&new_allocator.creating_stack, STACK_CREATING_UNLOCKED, memory_order_release);
 
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING
         atomic_store_explicit(&first_stack->accessing_ptr_status, false, memory_order_release);
         first_stack->ptr_status = calloc(sizeof(uint8_t), (chunk_item_amount / 8) + 1);
     #endif
@@ -157,7 +159,7 @@ static void create_new_stack(struct SwiftNetMemoryAllocator* const memory_alloca
         ((void **)allocated_memory_pointers)[i] = (uint8_t*)allocated_memory + (i * item_size);
     }
 
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING
         atomic_store_explicit(&stack->accessing_ptr_status, false, memory_order_release);
         stack->ptr_status = calloc(sizeof(uint8_t), (chunk_item_amount / 8) + 1);
     #endif
@@ -183,7 +185,7 @@ void* allocator_allocate(struct SwiftNetMemoryAllocator* const memory_allocator)
 
     void* item_ptr = *ptr_to_data;
 
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING
         const uint32_t offset = item_ptr - valid_stack->data;
         const uint32_t index = offset / memory_allocator->item_size;
 
@@ -202,7 +204,7 @@ void* allocator_allocate(struct SwiftNetMemoryAllocator* const memory_allocator)
     return item_ptr;
 }
 
-#ifdef SWIFT_NET_DEBUG
+#ifdef SWIFT_NET_INTERNAL_TESTING
     static inline bool is_already_free(struct SwiftNetMemoryAllocator* const memory_allocator, void* const memory_location) {
         for (struct SwiftNetMemoryAllocatorStack* stack = atomic_load_explicit(&memory_allocator->data.first_item, memory_order_acquire); stack != NULL; stack = atomic_load_explicit(&stack->next, memory_order_acquire)) {
             if (
@@ -235,7 +237,7 @@ void* allocator_allocate(struct SwiftNetMemoryAllocator* const memory_allocator)
 #endif
 
 void allocator_free(struct SwiftNetMemoryAllocator* const memory_allocator, void* const memory_location) {
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING
         const bool already_free = is_already_free(memory_allocator, memory_location);
 
         if (already_free == true) {
@@ -257,7 +259,7 @@ void allocator_free(struct SwiftNetMemoryAllocator* const memory_allocator, void
 
     ((void**)free_stack->pointers)[size] = memory_location;
 
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING
         const uint32_t offset = memory_location - free_stack->data;
         const uint32_t index = offset / memory_allocator->item_size;
 
@@ -286,7 +288,7 @@ void allocator_destroy(struct SwiftNetMemoryAllocator* const memory_allocator) {
             break;
         }
 
-        #ifdef SWIFT_NET_DEBUG
+        #ifdef SWIFT_NET_INTERNAL_TESTING
             lock_ptr_status(current_stack);
 
             const uint32_t total_items = memory_allocator->chunk_item_amount;
diff --git a/src/internal/internal.h b/src/internal/internal.h
@@ -142,11 +142,13 @@ extern int swiftnet_pcap_send(pcap_t *pcap, const uint8_t *data, int len);
 
 extern void* check_existing_listener(const char* interface_name, void* const connection, const enum ConnectionType connection_type, const bool loopback);
 
-#ifdef SWIFT_NET_DEBUG
-    extern struct SwiftNetDebugger debugger;
-
+#ifdef SWIFT_NET_INTERNAL_TESTING
     extern uint32_t bytes_leaked;
     extern uint32_t items_leaked;
+#endif
+
+#ifdef SWIFT_NET_DEBUG
+    extern struct SwiftNetDebugger debugger;
 
     static inline bool check_debug_flag(enum SwiftNetDebugFlags flag) {
         return (debugger.flags & flag) != 0;
diff --git a/src/swift_net.h b/src/swift_net.h
@@ -24,7 +24,7 @@
     #define SWIFT_NET_REQUESTS
 #endif
 
-#ifndef jWIFT_NET_DISABLE_DEBUGGING
+#ifndef SWIFT_NET_DISABLE_DEBUGGING
     #define SWIFT_NET_DEBUG
 #endif
 
@@ -189,7 +189,7 @@ struct SwiftNetMemoryAllocatorStack {
     _Atomic(void*) next;
     _Atomic(void*) previous;
     _Atomic uint8_t owner;
-    #ifdef SWIFT_NET_DEBUG
+    #ifdef SWIFT_NET_INTERNAL_TESTING 
     uint8_t* ptr_status;
     _Atomic bool accessing_ptr_status;
     #endif
diff --git a/tests/build_tests.sh b/tests/build_tests.sh
@@ -1,3 +1,2 @@
-../build/build_for_testing.sh
 cmake . -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread
 make -B -j8

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-cmake ../src -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread -DSWIFT_NET_INTERNAL_TESTING`
	`1`	`+cmake ../src -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread -DSWIFT_NET_INTERNAL_TESTING=ON`
`2`	`2`	`make -B -j8`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,7 @@ void swiftnet_cleanup() {`
`38`	`38`
`39`	`39`	`allocator_destroy(&listener_memory_allocator);`
`40`	`40`
	`41`	`+ #ifdef SWIFT_NET_INTERNAL_TESTING`
`41`	`42`	`printf("Bytes leaked: %d\nItems leaked: %d\n", bytes_leaked, items_leaked);`
	`43`	`+ #endif`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-../build/build_for_testing.sh`
`2`	`1`	`cmake . -DCMAKE_BUILD_TYPE=Debug -DSANITIZER=thread`
`3`	`2`	`make -B -j8`