From f52f2c2828047c2f30d30fc1fe2b54d8db146d49 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期四, 25 二月 2021 15:56:35 +0800 Subject: [PATCH] update --- src/socket/shm_mod_socket.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h index b866f0c..0c65f52 100644 --- a/src/socket/shm_mod_socket.h +++ b/src/socket/shm_mod_socket.h @@ -3,7 +3,7 @@ #include "usg_common.h" #include "shm_socket.h" #include "shm_allocator.h" -#include "mem_pool.h" +#include "shm_mm.h" #include "hashtable.h" #include "sem_util.h" #include "logger_factory.h" @@ -36,7 +36,8 @@ static int get_bus_sendbuf(bus_head_t &request_head, const void *topic_buf, int topic_size, const void *content_buf, int content_size, void **retbuf); public: - static size_t remove_keys(int keys[], size_t length); + // static size_t remove_keys(int keys[], size_t length); + // static size_t remove_keys_exclude(int keys[], size_t length); // bus header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭 static void * encode_bus_head(bus_head_t & bushead); @@ -47,6 +48,7 @@ ShmModSocket(); ~ShmModSocket(); + int stop(); /** * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 @@ -87,8 +89,10 @@ const struct timespec *timeout = NULL, int flag = 0); - int recvandsend(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback, - const struct timespec *timeout = NULL , int flag = 0); + /** + * + */ + int recvandsend( recvandsend_callback_fn callback, const struct timespec *timeout = NULL , int flag = 0, void * user_data = NULL); /** * 璁㈤槄鎸囧畾涓婚 -- Gitblit v1.8.0