From 79f2c35744a3a805c2f7b0884cf72f310a7d2dd2 Mon Sep 17 00:00:00 2001 From: liuyu Date: Mon, 1 Jul 2024 04:12:21 -0400 Subject: malloc 和free函数通过参数传入 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbq/include/bbq.h | 34 ++++---- bbq/src/bbq.c | 153 +++++++++++++++-------------------- bbq/tests/common/test_queue.c | 14 ++-- bbq/tests/unittest/ut_example.cc | 18 ++--- bbq/tests/unittest/ut_head_cursor.cc | 20 ++--- perf/CMakeLists.txt | 2 + 6 files changed, 117 insertions(+), 124 deletions(-) diff --git a/bbq/include/bbq.h b/bbq/include/bbq.h index e91b4fd..9fbae2b 100644 --- a/bbq/include/bbq.h +++ b/bbq/include/bbq.h @@ -1,6 +1,6 @@ /* * @Author: liuyu@geedgenetworks.com - * @LastEditTime: 2024-06-29 11:28:08 + * @LastEditTime: 2024-07-01 03:53:40 * @Describe: bbq（Block-based Bounded Queue）头文件 * 参考：https://www.usenix.org/system/files/atc22-wang-jiawei.pdf */ @@ -40,20 +40,23 @@ struct bbq_block { char *entries; // 存储大小可变的entry，每个块分配空间：bs * entry_size } __BBQ_CACHE_ALIGNED; +typedef void *(*bbq_malloc_f)(int32_t socket_id, size_t size); +typedef void (*bbq_free_f)(void *ptr, size_t size); + struct bbq { char name[BBQ_SYMBOL_MAX] __BBQ_CACHE_ALIGNED; - int32_t socket_id; // 用于libnuma分配内存，socket_id小于0将使用malloc分配 - uint32_t bn; // blocks的个数 - uint32_t bs; // blocks.entries的个数 - uint32_t flags; // 标记：retry new 模式，还是drop old模式 - uint32_t idx_bits; // bbq_head里idx所占的位数 - uint32_t off_bits; // bbq_cursor里offset所占的位数 - uint64_t idx_mask; // idx_bits偏移后的掩码 - uint64_t off_mask; // off_bits偏移后的掩码 - uint64_t entry_size; // blocks.entries里每个entry的大小 - uint64_t pad1; - uint64_t pad2; + int32_t socket_id; // 用于libnuma分配内存，socket_id小于0将使用malloc分配 + uint32_t bn; // blocks的个数 + uint32_t bs; // blocks.entries的个数 + uint32_t flags; // 标记：retry new 模式，还是drop old模式 + uint32_t idx_bits; // bbq_head里idx所占的位数 + uint32_t off_bits; // bbq_cursor里offset所占的位数 + uint64_t idx_mask; // idx_bits偏移后的掩码 + uint64_t off_mask; // off_bits偏移后的掩码 + uint64_t entry_size; // blocks.entries里每个entry的大小 + bbq_malloc_f malloc_f; // 申请内存的函数，默认为malloc + bbq_free_f free_f; // 申请内存的函数，默认为free struct bbq_atomic64 phead; // 生产者头，指向块的索引，分为两部分：version|idx struct bbq_atomic64 chead; // 消费者头，指向块的索引，分为两部分：version|idx @@ -110,7 +113,8 @@ struct bbq { * - BBQ_ERR_POWER_OF_TWO：count不为2的n次方 * - BBQ_ERR_INPUT_NULL：name传入空指针 */ -extern struct bbq *bbq_create(const char *name, uint32_t count, int socket_id, uint32_t flags); +extern struct bbq *bbq_create(const char *name, uint32_t count, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f); /** * 消息队列单个指针入队 @@ -217,7 +221,9 @@ extern uint32_t bbq_dequeue_burst(struct bbq *q, void **obj_table, uint32_t n, u * - BBQ_ERR_POWER_OF_TWO：count不为2的n次方 * - BBQ_ERR_INPUT_NULL：name传入空指针 */ -extern struct bbq *bbq_create_elem(const char *name, uint32_t count, size_t obj_size, int socket_id, uint32_t flags); +extern struct bbq *bbq_create_elem(const char *name, uint32_t count, size_t obj_size, + int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f); /** * 消息队列单个数据入队（指针指向的数据将被拷贝） diff --git a/bbq/src/bbq.c b/bbq/src/bbq.c index 4ad7aba..882ba67 100644 --- a/bbq/src/bbq.c +++ b/bbq/src/bbq.c @@ -1,6 +1,6 @@ /* * @Author: liuyu - * @LastEditTime: 2024-07-01 03:04:17 + * @LastEditTime: 2024-07-01 04:05:34 * @Email: liuyu@geedgenetworks.com * @Describe: bbq（Block-based Bounded Queue）实现 * 参考：https://www.usenix.org/system/files/atc22-wang-jiawei.pdf @@ -109,57 +109,35 @@ static inline uint64_t bbq_atomic64_fetch_add(struct bbq_atomic64 *atomic, uint6 } // 当BBQ_MEMORY宏定义开关打开，将对内存分配释放进行统计，方便排查内存泄漏 -enum bbq_module { - BBQ_MODULE_MAIN = 0, - BBQ_MODULE_BLOCK_NB, - BBQ_MODULE_BLOCK_ENTRY, - BBQ_MODULE_MAX, -}; #ifdef BBQ_MEMORY #define BBQ_MEM_MAGIC 0xFF struct bbq_memory_s { - aotmic_uint64 malloc_cnt; - aotmic_uint64 malloc_size; - aotmic_uint64 free_cnt; - aotmic_uint64 free_size; + uint64_t malloc_cnt; + uint64_t malloc_size; + uint64_t free_cnt; + uint64_t free_size; }; -struct bbq_memory_s bbq_memory_g[BBQ_MODULE_MAX] = {0}; +struct bbq_memory_s bbq_memory_g = {0}; #endif -static void *bbq_malloc(enum bbq_module module, int socket_id, size_t size) { - void *ptr = NULL; - if (socket_id >= 0) { - ptr = numa_alloc_onnode(size, 0); - } else { - ptr = malloc(size); - } +void *bbq_malloc_def_callback(int32_t socket_id __attribute__((unused)), size_t size) { #ifdef BBQ_MEMORY - if (ptr != NULL) { - atomic_fetch_add(&bbq_memory_g[module].malloc_cnt, 1); - atomic_fetch_add(&bbq_memory_g[module].malloc_size, size); - } -#else - AVOID_WARNING(module); + bbq_memory_g.malloc_cnt++; + bbq_memory_g.malloc_size += size; #endif - return ptr; + return malloc(size); } -static void bbq_free(enum bbq_module module, int socket_id, void *ptr, size_t size) { - if (socket_id >= 0) { - numa_free(ptr, size); - } else { - free(ptr); - } - +void bbq_free_def_callback(void *ptr, + size_t size __attribute__((unused))) { #ifdef BBQ_MEMORY - if (ptr != NULL) { - atomic_fetch_add(&bbq_memory_g[module].free_cnt, 1); - atomic_fetch_add(&bbq_memory_g[module].free_size, size); + if (ptr) { + bbq_memory_g.free_cnt++; + bbq_memory_g.free_size += size; } -#else - AVOID_WARNING(module); #endif + free(ptr); } /* 原子的比较两个值大小，并设置较大的值，成功则返回设置前的旧值 */ @@ -225,14 +203,13 @@ int block_init(struct bbq *q, struct bbq_block *block, bool cursor_init, uint32_ #ifdef BBQ_MEMORY // 末尾多分配一个entry，它永远不应该被修改，以此检查是否存在写越界的问题 size = (q->bs + 1) * q->entry_size; - block->entries = bbq_malloc(BBQ_MODULE_BLOCK_ENTRY, q->socket_id, size); + block->entries = q->malloc_f(q->socket_id, size); char *last_entry = block->entries + q->entry_size * q->bs; memset(block->entries, 0, size); memset(last_entry, BBQ_MEM_MAGIC, q->entry_size); #else size = q->bs * q->entry_size; - block->entries = bbq_malloc(BBQ_MODULE_BLOCK_ENTRY, q->socket_id, - q->bs * q->entry_size); + block->entries = q->malloc_f(q->socket_id, q->bs * q->entry_size); memset(block->entries, 0, size); #endif @@ -268,11 +245,9 @@ int block_init(struct bbq *q, struct bbq_block *block, bool cursor_init, uint32_ void block_destory(struct bbq *q, struct bbq_block *block) { if (block->entries) { #ifdef BBQ_MEMORY - bbq_free(BBQ_MODULE_BLOCK_ENTRY, q->socket_id, - block->entries, (q->bs + 1) * q->entry_size); + q->free_f(block->entries, (q->bs + 1) * q->entry_size); #else - bbq_free(BBQ_MODULE_BLOCK_ENTRY, q->socket_id, - block->entries, q->bs * q->entry_size); + q->free_f(block->entries, q->bs * q->entry_size); #endif block->entries = NULL; } @@ -295,7 +270,9 @@ static unsigned bbq_ceil_log2(uint64_t x) { } /* 创建消息队列，bn和bs必须是2的N次幂，socket_id用于多numa分配内存 */ -static struct bbq *__bbq_create_bnbs(const char *name, uint32_t bn, uint32_t bs, size_t obj_size, int socket_id, uint32_t flags) { +static struct bbq *__bbq_create_bnbs(const char *name, uint32_t bn, uint32_t bs, + size_t obj_size, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f) { int ret = 0; size_t size = 0; if (bbq_check_power_of_two(bn) == false) { @@ -323,7 +300,15 @@ static struct bbq *__bbq_create_bnbs(const char *name, uint32_t bn, uint32_t bs, socket_id = BBQ_SOCKET_ID_ANY; } - struct bbq *q = bbq_malloc(BBQ_MODULE_MAIN, socket_id, sizeof(*q)); + if (malloc_f == NULL) { + malloc_f = bbq_malloc_def_callback; + } + + if (free_f == NULL) { + free_f = bbq_free_def_callback; + } + + struct bbq *q = malloc_f(socket_id, sizeof(*q)); if (q == NULL) { bbq_errno = BBQ_ERR_ALLOC; return NULL; @@ -341,9 +326,11 @@ static struct bbq *__bbq_create_bnbs(const char *name, uint32_t bn, uint32_t bs, q->chead.single = true; } q->flags = flags; + q->malloc_f = malloc_f; + q->free_f = free_f; size = bn * sizeof(*q->blocks); - q->blocks = bbq_malloc(BBQ_MODULE_BLOCK_NB, socket_id, size); + q->blocks = q->malloc_f(socket_id, size); if (q->blocks == NULL) { bbq_errno = BBQ_ERR_ALLOC; goto error; @@ -375,19 +362,25 @@ error: } /* 使用自定义的bn、bs创建指针入队的bbq，一般用于单元测试 */ -struct bbq *bbq_create_with_bnbs(const char *name, uint32_t bn, uint32_t bs, int socket_id, uint32_t flags) { +struct bbq *bbq_create_with_bnbs(const char *name, uint32_t bn, uint32_t bs, + int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f) { bbq_errno = BBQ_OK; - return __bbq_create_bnbs(name, bn, bs, sizeof(void *), socket_id, flags | BBQ_F_COPY_PTR); + return __bbq_create_bnbs(name, bn, bs, sizeof(void *), socket_id, flags | BBQ_F_COPY_PTR, malloc_f, free_f); } /* 使用自定义的bn、bs创建值入队的bbq，一般用于单元测试 */ -struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, uint32_t bs, size_t obj_size, int socket_id, uint32_t flags) { +struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, uint32_t bs, + size_t obj_size, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f) { bbq_errno = BBQ_OK; - return __bbq_create_bnbs(name, bn, bs, obj_size, socket_id, flags | BBQ_F_COPY_VALUE); + return __bbq_create_bnbs(name, bn, bs, obj_size, socket_id, flags | BBQ_F_COPY_VALUE, malloc_f, free_f); } /* 创建消息队列，count必须大于1，且是2的N次幂，bn和bs将根据count值自动计算，socket_id用于多numa分配内存，free_func先设置NULL */ -struct bbq *bbq_create_elem(const char *name, uint32_t count, size_t obj_size, int socket_id, uint32_t flags) { +struct bbq *bbq_create_elem(const char *name, uint32_t count, size_t obj_size, + int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f) { bbq_errno = BBQ_OK; uint32_t bn = 0; uint32_t bs = 0; @@ -396,10 +389,11 @@ struct bbq *bbq_create_elem(const char *name, uint32_t count, size_t obj_size, i return NULL; } - return __bbq_create_bnbs(name, bn, bs, obj_size, socket_id, flags | BBQ_F_COPY_VALUE); + return __bbq_create_bnbs(name, bn, bs, obj_size, socket_id, flags | BBQ_F_COPY_VALUE, malloc_f, free_f); } -struct bbq *bbq_create(const char *name, uint32_t count, int socket_id, uint32_t flags) { +struct bbq *bbq_create(const char *name, uint32_t count, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f) { bbq_errno = BBQ_OK; uint32_t bn = 0; uint32_t bs = 0; @@ -408,7 +402,7 @@ struct bbq *bbq_create(const char *name, uint32_t count, int socket_id, uint32_t return NULL; } - return __bbq_create_bnbs(name, bn, bs, sizeof(void *), socket_id, flags | BBQ_F_COPY_PTR); + return __bbq_create_bnbs(name, bn, bs, sizeof(void *), socket_id, flags | BBQ_F_COPY_PTR, malloc_f, free_f); } /* 释放消息队列，与bbq_ring_create系列接口成对*/ @@ -421,8 +415,8 @@ void bbq_destory(struct bbq *q) { block_destory(q, &(q->blocks[i])); } - bbq_free(BBQ_MODULE_BLOCK_NB, q->socket_id, q->blocks, q->bn * sizeof(*q->blocks)); - bbq_free(BBQ_MODULE_MAIN, q->socket_id, q, sizeof(*q)); + q->free_f(q->blocks, q->bn * sizeof(*q->blocks)); + q->free_f(q, sizeof(*q)); } #define BBQ_DATA_TYPE_SINGLE 0x0 @@ -479,7 +473,6 @@ void bbq_commit_entry(struct bbq *q, struct bbq_entry_desc *e, void const *data, struct bbq_queue_state_s bbq_allocate_entry(struct bbq *q, uint64_t ph, uint32_t n) { struct bbq_queue_state_s state = {0}; uint64_t ph_idx = bbq_head_idx(q, ph); - uint64_t ph_ver = bbq_head_vsn(q, ph); struct bbq_block *block = &(q->blocks[ph_idx]); if (bbq_cur_off(q, bbq_atomic64_load(&block->allocated)) >= q->bs) { @@ -491,6 +484,7 @@ struct bbq_queue_state_s bbq_allocate_entry(struct bbq *q, uint64_t ph, uint32_t uint64_t cur_vsn = bbq_cur_vsn(q, old); uint64_t cur_off = bbq_cur_off(q, old); #ifdef TEST_PERF_1 + // uint64_t ph_ver = bbq_head_vsn(q, ph); // if ((cur_off >= q->bs) || bbq_cursor_overflow(ph_idx, ph_ver, cur_vsn)) { // state.state = BBQ_BLOCK_DONE; // return state; @@ -1100,26 +1094,19 @@ uint32_t bbq_dequeue_burst_elem(struct bbq *q, void *obj_table, uint32_t n, uint bool bbq_malloc_free_equal() { #ifdef BBQ_MEMORY - bool ret = true; - for (int i = 0; i < BBQ_MODULE_MAX; i++) { - uint64_t malloc_cnt = atomic_load(&bbq_memory_g[i].malloc_cnt); - uint64_t free_cnt = atomic_load(&bbq_memory_g[i].free_cnt); - if (malloc_cnt != free_cnt) { - BBQ_ERR_LOG("[module:%d] malloc:%lu free:%lu, bbq mmalloc-free count not equal\n", i, malloc_cnt, free_cnt); - ret = false; - } + if (bbq_memory_g.malloc_cnt != bbq_memory_g.free_cnt) { + BBQ_ERR_LOG("malloc:%lu free:%lu, bbq mmalloc-free count not equal\n", + bbq_memory_g.malloc_cnt, bbq_memory_g.free_cnt); + return false; + } - uint64_t malloc_size = atomic_load(&bbq_memory_g[i].malloc_size); - uint64_t free_size = atomic_load(&bbq_memory_g[i].free_size); - if (malloc_size != free_size) { - BBQ_ERR_LOG("[module:%d] malloc:%lu byte free:%lu byte, bbq mmalloc-free size not equal\n", i, malloc_size, free_size); - ret = false; - } + if (bbq_memory_g.malloc_size != bbq_memory_g.free_size) { + BBQ_ERR_LOG("malloc:%lu byte free:%lu byte, bbq mmalloc-free size not equal\n", + bbq_memory_g.malloc_size, bbq_memory_g.free_size); + return false; } - return ret; -#else - return true; #endif + return true; } bool bbq_debug_check_array_bounds(struct bbq *q) { @@ -1142,17 +1129,9 @@ bool bbq_debug_check_array_bounds(struct bbq *q) { void bbq_debug_memory_print() { #ifdef BBQ_MEMORY - for (int i = 0; i < BBQ_MODULE_MAX; i++) { - uint64_t malloc_cnt = atomic_load(&bbq_memory_g[i].malloc_cnt); - uint64_t free_cnt = atomic_load(&bbq_memory_g[i].free_cnt); - if (malloc_cnt == 0 && free_cnt == 0) { - continue; - } - - printf("[%d]bbq malloc:%lu free:%lu\n", i, - atomic_load(&bbq_memory_g[i].malloc_cnt), - atomic_load(&bbq_memory_g[i].free_cnt)); - } + printf("bbq malloc:%lu free:%lu\n", + bbq_memory_g.malloc_cnt, + bbq_memory_g.free_cnt); if (bbq_malloc_free_equal()) { printf("all memory free\n"); diff --git a/bbq/tests/common/test_queue.c b/bbq/tests/common/test_queue.c index 6daeb1b..e72f1ee 100644 --- a/bbq/tests/common/test_queue.c +++ b/bbq/tests/common/test_queue.c @@ -1,6 +1,6 @@ /* * @Author: liuyu - * @LastEditTime: 2024-06-30 22:33:09 + * @LastEditTime: 2024-07-01 03:56:01 * @Email: liuyu@geedgenetworks.com * @Describe: TODO */ @@ -11,8 +11,12 @@ #include #include extern bool bbq_debug_check_array_bounds(struct bbq *q); -extern struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, uint32_t bs, size_t obj_size, int socket_id, uint32_t flags); -extern struct bbq *bbq_create_with_bnbs(const char *name, uint32_t bn, uint32_t bs, int socket_id, uint32_t flags); +extern struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, + uint32_t bs, size_t obj_size, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f); +extern struct bbq *bbq_create_with_bnbs(const char *name, uint32_t bn, uint32_t bs, + int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f); uint32_t test_bbq_enqueue_burst(void *ring, void **obj_table, uint32_t n, uint16_t thread_idx, uint32_t *wait_consumed) { TEST_AVOID_WARNING(thread_idx); @@ -36,11 +40,11 @@ int test_queue_init_bbq(test_cfg *cfg, test_queue_s *q) { } if (cfg->ring.block_count == 0) { - q->ring = bbq_create("test_bbq", cfg->ring.entries_cnt, BBQ_SOCKET_ID_ANY, flags); + q->ring = bbq_create("test_bbq", cfg->ring.entries_cnt, BBQ_SOCKET_ID_ANY, flags, NULL, NULL); } else { q->ring = bbq_create_with_bnbs("test_bbq", cfg->ring.block_count, cfg->ring.entries_cnt / cfg->ring.block_count, - BBQ_SOCKET_ID_ANY, flags); + BBQ_SOCKET_ID_ANY, flags, NULL, NULL); } if (q->ring == NULL) { diff --git a/bbq/tests/unittest/ut_example.cc b/bbq/tests/unittest/ut_example.cc index 0d06d28..11735cc 100644 --- a/bbq/tests/unittest/ut_example.cc +++ b/bbq/tests/unittest/ut_example.cc @@ -1,6 +1,6 @@ /* * @Author: liuyu - * @LastEditTime: 2024-06-27 22:57:02 + * @LastEditTime: 2024-07-01 03:56:54 * @Email: liuyu@geedgenetworks.com * @Describe: 简单的测试用例，测试基本功能 */ @@ -52,7 +52,7 @@ TEST_F(bbq_example, single_retry_new_cp_ptr) { uint16_t *deq_data = NULL; // 创建队列 - struct bbq *q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + struct bbq *q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); // 空队出队失败 @@ -97,7 +97,7 @@ TEST_F(bbq_example, single_retry_new_cp_value) { uint16_t deq_data; // 创建队列 - struct bbq *q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + struct bbq *q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); // 空队出队失败 @@ -144,7 +144,7 @@ TEST_F(bbq_example, single_drop_old_cp_pointer) { uint64_t second_cnt = 1000; // 创建队列 - struct bbq *q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + struct bbq *q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_LT(second_cnt, q->bs * q->bn); @@ -198,7 +198,7 @@ TEST_F(bbq_example, single_drop_old_cp_value) { uint64_t second_cnt = 1000; // 创建队列 - struct bbq *q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + struct bbq *q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_LT(second_cnt, q->bs * q->bn); @@ -254,7 +254,7 @@ TEST_F(bbq_example, burst_retry_new_cp_value) { uint32_t wait_consumed = 0; // 创建队列 - q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW | BBQ_F_ENABLE_STAT); + q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW | BBQ_F_ENABLE_STAT, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_LT(first_cnt, q->bn * q->bs); @@ -304,7 +304,7 @@ TEST_F(bbq_example, burst_retry_new_cp_pointer) { uint16_t **deq_table2 = (uint16_t **)test_malloc(TEST_MODULE_DATA, sizeof(uint16_t *) * BUF_CNT); // 创建队列 - q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW | BBQ_F_ENABLE_STAT); + q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW | BBQ_F_ENABLE_STAT, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_LT(first_cnt, q->bn * q->bs); @@ -353,7 +353,7 @@ TEST_F(bbq_example, burst_drop_old_cp_pointer) { uint16_t **deq_table2 = (uint16_t **)test_malloc(TEST_MODULE_DATA, sizeof(uint16_t *) * BUF_CNT); // 创建队列 - q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + q = bbq_create("test_bbq", BUF_CNT, BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_GT(second_cnt, q->bs); EXPECT_LT(second_cnt, q->bs * q->bn); @@ -402,7 +402,7 @@ TEST_F(bbq_example, burst_drop_old_cp_value) { uint16_t deq_table1[BUF_CNT] = {0}; // 创建队列 - q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + q = bbq_create_elem("test_bbq", BUF_CNT, sizeof(uint16_t), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_GT(second_cnt, q->bs); EXPECT_LT(second_cnt, q->bs * q->bn); diff --git a/bbq/tests/unittest/ut_head_cursor.cc b/bbq/tests/unittest/ut_head_cursor.cc index b9ba29c..bbd2296 100644 --- a/bbq/tests/unittest/ut_head_cursor.cc +++ b/bbq/tests/unittest/ut_head_cursor.cc @@ -1,6 +1,6 @@ /* * @Author: liuyu - * @LastEditTime: 2024-07-01 03:08:03 + * @LastEditTime: 2024-07-01 03:57:33 * @Email: liuyu@geedgenetworks.com * @Describe: TODO */ @@ -10,7 +10,9 @@ extern "C" { #include "ut.h" extern bool bbq_malloc_free_equal(); extern bool bbq_debug_check_array_bounds(struct bbq *q); -extern struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, uint32_t bs, size_t obj_size, int socket_id, uint32_t flags); +extern struct bbq *bbq_create_elem_with_bnbs(const char *name, uint32_t bn, uint32_t bs, + size_t obj_size, int socket_id, uint32_t flags, + bbq_malloc_f malloc_f, bbq_free_f free_f); extern uint64_t bbq_atomic64_load(struct bbq_atomic64 *atomic); } @@ -71,7 +73,7 @@ TEST_F(bbq_head_cursor, init) { struct bbq *q; uint32_t bn = 2; uint32_t bs = 4; - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); // 1.初始化状态,除了第一个block外其他块的4个游标都指向最后一个条目 @@ -104,7 +106,7 @@ void ut_produce_something(uint32_t produce_cnt) { EXPECT_GT(produce_cnt, 0); EXPECT_LE(produce_cnt, bs); - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); // 生产produce_cnt @@ -163,7 +165,7 @@ void ut_produce_next_block(uint32_t over) { EXPECT_GT(over, 0); EXPECT_LT(over, bs); - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); // 生产至第二块的第一个entry @@ -224,7 +226,7 @@ void ut_produce_all_loop(uint32_t loop) { int enqueue_data = TEST_DATA_MAGIC; int dequeue_data = 0; - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); for (uint32_t cnt = 0; cnt < loop; cnt++) { @@ -280,7 +282,7 @@ TEST_F(bbq_head_cursor, retry_new_full_empty) { int tmp_data = 0; EXPECT_TRUE(data); - q = bbq_create_elem("test_bbq", entries_cnt, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW); + q = bbq_create_elem("test_bbq", entries_cnt, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_RETRY_NEW, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_TRUE(bbq_empty(q)); @@ -415,7 +417,7 @@ TEST_F(bbq_head_cursor, drop_old_full_empty) { struct bbq *q; int tmp_data = 0; - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_TRUE(bbq_empty(q)); @@ -466,7 +468,7 @@ TEST_F(bbq_head_cursor, drop_old_full_empty_cover) { EXPECT_EQ(over_cnt / bs, 1); int tmp_data = 0; - q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD); + q = bbq_create_elem_with_bnbs("test_bbq", bn, bs, sizeof(int), BBQ_SOCKET_ID_ANY, BBQ_F_DROP_OLD, NULL, NULL); ASSERT_NE(q, nullptr); EXPECT_TRUE(bbq_empty(q)); diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt index 1abb654..803ebbe 100644 --- a/perf/CMakeLists.txt +++ b/perf/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/iniparser ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/rmind_ringbuf /root/code/c/dpdk-21.11.4/install/include + #/home/liuyu/code/marsio/build/support/dpdk/include ) # 将bbq单元测试里的公共文件，添加到perf里。 @@ -36,6 +37,7 @@ set(EXEC_PATH ${OUTPUT_DIR}/bin) link_directories(${LIB_PATH}) link_directories(../bbq/build/output/lib/) link_directories(/root/code/c/dpdk-21.11.4/install/lib64 /root/code/c/dpdk-21.11.4/install/lib64/dpdk/pmds-22.0) +# link_directories(/home/liuyu/code/marsio/build/support/dpdk/lib64 /home/liuyu/code/marsio/build/support/dpdk/lib64/dpdk/pmds-22.0) # 可执行程序的名字 set(BENCHMARK_NAME benchmark) -- cgit v1.2.3