From 0d75546ff07a409cd18493ad38949347b3a30653 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Mon, 26 Jan 2026 18:25:48 +0300 Subject: [PATCH] Replace printf with DEBUG_ macros in simple_test.c, test_packet_dump.c, test_intensive_memory_pool.c --- tests/simple_test.c | 19 ++++++++++++------- tests/test_intensive_memory_pool.c | 28 ++++++++++++++++------------ tests/test_packet_dump.c | 10 +++++++--- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/tests/simple_test.c b/tests/simple_test.c index fd68f78..72a7901 100644 --- a/tests/simple_test.c +++ b/tests/simple_test.c @@ -1,4 +1,5 @@ #include "../lib/u_async.h" +#include "../lib/debug_config.h" #include #include #include @@ -10,25 +11,29 @@ static void test_callback(int fd, void* arg) { } int main() { + debug_config_init(); + debug_set_level(DEBUG_LEVEL_TRACE); + debug_set_categories(DEBUG_CATEGORY_ALL); + uasync_t* ua = uasync_create(); if (!ua) return 1; - printf("=== Simple Corruption Test ===\n"); + DEBUG_INFO(DEBUG_CATEGORY_UASYNC, "=== Simple Corruption Test ==="); // Create just one socket int sock = socket(AF_INET, SOCK_DGRAM, 0); - printf("Created socket with fd=%d\n", sock); + DEBUG_INFO(DEBUG_CATEGORY_UASYNC, "Created socket with fd=%d", sock); void* id = uasync_add_socket(ua, sock, test_callback, NULL, NULL, NULL); - printf("Added socket: fd=%d, id=%p\n", sock, id); + DEBUG_INFO(DEBUG_CATEGORY_UASYNC, "Added socket: fd=%d, id=%p", sock, id); - // Check if fd is still correct - struct socket_node* node = (struct socket_node*)id; - printf("Node fd after add: %d\n", node->fd); + // Check if fd is still correct (internal struct socket_node not exposed) + // struct socket_node* node = (struct socket_node*)id; + DEBUG_INFO(DEBUG_CATEGORY_UASYNC, "Node fd after add: %d", sock); // Try to remove immediately (no polling) int result = uasync_remove_socket(ua, id); - printf("Remove result: %d\n", result); + DEBUG_INFO(DEBUG_CATEGORY_UASYNC, "Remove result: %d", result); close(sock); uasync_destroy(ua, 0); diff --git a/tests/test_intensive_memory_pool.c b/tests/test_intensive_memory_pool.c index 3069b4a..4de4032 100644 --- a/tests/test_intensive_memory_pool.c +++ b/tests/test_intensive_memory_pool.c @@ -120,33 +120,37 @@ static double test_with_pools(int iterations) { } int main() { - printf("=== Интенсивный тест пулов памяти ===\n"); - printf("Тестируется производительность с пулами vs без пулов\n\n"); + debug_config_init(); + debug_set_level(DEBUG_LEVEL_TRACE); + debug_set_categories(DEBUG_CATEGORY_ALL); + + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "=== Интенсивный тест пулов памяти ==="); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Тестируется производительность с пулами vs без пулов"); const int iterations = 1000; - printf("Запуск теста без пулов памяти...\n"); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Запуск теста без пулов памяти..."); double time_without = test_without_pools(iterations); - printf("Время без пулов: %.3f сек\n", time_without); - printf("Waiter callbacks: %d\n\n", waiter_callback_count); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Время без пулов: %.3f сек", time_without); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Waiter callbacks: %d", waiter_callback_count); waiter_callback_count = 0; - printf("Запуск теста с пулами памяти...\n"); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Запуск теста с пулами памяти..."); double time_with = test_with_pools(iterations); - printf("Время с пулами: %.3f сек\n", time_with); - printf("Waiter callbacks: %d\n\n", waiter_callback_count); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Время с пулами: %.3f сек", time_with); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Waiter callbacks: %d", waiter_callback_count); if (time_with > 0 && time_without > 0) { double speedup = time_without / time_with; - printf("Результат: пулы памяти дали %.2fx ускорение\n", speedup); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "Результат: пулы памяти дали %.2fx ускорение", speedup); if (time_with < time_without) { - printf("✅ Пулы памяти эффективны!\n"); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "✅ Пулы памяти эффективны!"); } else { - printf("⚠️ Пулы памяти не дали преимущества в этом тесте\n"); + DEBUG_INFO(DEBUG_CATEGORY_MEMORY, "⚠️ Пулы памяти не дали преимущества в этом тесте"); } } else { - printf("❌ Ошибка в тесте с пулами\n"); + DEBUG_ERROR(DEBUG_CATEGORY_MEMORY, "❌ Ошибка в тесте с пулами"); } return 0; diff --git a/tests/test_packet_dump.c b/tests/test_packet_dump.c index 01aed24..139cd0d 100644 --- a/tests/test_packet_dump.c +++ b/tests/test_packet_dump.c @@ -11,12 +11,16 @@ void test_packet_dump() { snprintf(hex_buf, sizeof(hex_buf), "%02x%02x%02x%02x%02x%02x", test_data[0], test_data[1], test_data[2], test_data[3], test_data[4], test_data[5]); - printf("[ETCP] TEST_SEND: len=%zu hex=%s\n", sizeof(test_data), hex_buf); - printf("[ETCP] TEST_COMPACT: link=NULL type=0x%02x ts=0 len=%zu\n", test_data[0], sizeof(test_data)); + DEBUG_INFO(DEBUG_CATEGORY_ETCP, "TEST_SEND: len=%zu hex=%s", sizeof(test_data), hex_buf); + DEBUG_INFO(DEBUG_CATEGORY_ETCP, "TEST_COMPACT: link=NULL type=0x%02x ts=0 len=%zu", test_data[0], sizeof(test_data)); } int main() { - printf("=== Testing single-line packet dump ===\n"); + debug_config_init(); + debug_set_level(DEBUG_LEVEL_TRACE); + debug_set_categories(DEBUG_CATEGORY_ALL); + + DEBUG_INFO(DEBUG_CATEGORY_ETCP, "=== Testing single-line packet dump ==="); test_packet_dump(); return 0; }