From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001 From: fujuntang <fujuntang@aiot.com> Date: 星期三, 11 八月 2021 09:50:20 +0800 Subject: [PATCH] fix from 3.1 first commit --- src/socket/shm_mod_socket.h | 65 +++++++++++++------------------- 1 files changed, 27 insertions(+), 38 deletions(-) diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h index 73c91c3..9890aef 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" @@ -11,7 +11,7 @@ #include <set> #include "socket_def.h" -#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t)) +#define BUS_HEAD_SIZE sizeof(bus_head_t) class BusServerSocket; struct bus_head_t @@ -31,16 +31,13 @@ private: - int _sub_( char *topic, int size, int key, struct timespec *timeout, int flags); - int _pub_( char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout, int flags); + - int _desub_( char *topic, int size, int key, struct timespec *timeout, int flags); - - - static int get_bus_sendbuf(bus_head_t &request_head, void *topic_buf, int topic_size, void *content_buf, int content_size, void **retbuf); + 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); @@ -51,6 +48,7 @@ ShmModSocket(); ~ShmModSocket(); + int stop(); /** * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 @@ -65,50 +63,45 @@ /** * 鍙戦�佷俊鎭� * @key 鍙戦�佺粰璋� + * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ - int sendto(const void *buf, const int size, const int key); - // 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇 - int sendto_timeout(const void *buf, const int size, const int key, const struct timespec *timeout); - // 鍙戦�佷俊鎭珛鍒昏繑鍥炪�� - int sendto_nowait(const void *buf, const int size, const int key); + + int sendto(const void *buf, const int size, const int key, const struct timespec *timeout = NULL, int flag = 0); + /** * 鎺ユ敹淇℃伅 * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ - int recvfrom(void **buf, int *size, int *key); - // 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int recvfrom_timeout(void **buf, int *size, int *key, struct timespec *timeout); - int recvfrom_nowait(void **buf, int *size, int *key); + + int recvfrom(void **buf, int *size, int *key, const struct timespec *timeout = NULL, int flag = 0); /** * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟 * @key 鍙戦�佺粰璋� + * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ - int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ; - // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int sendandrecv_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ; - int sendandrecv_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ; + + int sendandrecv(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, + const struct timespec *timeout = NULL, int flag = 0); - int sendandrecv_unsafe(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ; - // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, struct timespec *timeout) ; - int sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) ; + /** + * + */ + int recvandsend( recvandsend_callback_fn callback, const struct timespec *timeout = NULL , int flag = 0, void * user_data = NULL); /** * 璁㈤槄鎸囧畾涓婚 * @topic 涓婚 * @size 涓婚闀垮害 * @key 鎬荤嚎绔彛 + * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG */ - int sub(char *topic, int size, int key); - // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int sub_timeout(char *topic, int size, int key, struct timespec *timeout); - int sub_nowait(char *topic, int size, int key); + int sub(const char *topic, int size, int key, const struct timespec *timeout = NULL, int flag = 0); /** @@ -116,22 +109,18 @@ * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃� * @size 涓婚闀垮害 * @key 鎬荤嚎绔彛 + * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG */ - int desub( char *topic, int size, int key); - // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int desub_timeout(char *topic, int size, int key, struct timespec *timeout); - int desub_nowait(char *topic, int size, int key) ; + int desub(const char *topic, int size, int key, const struct timespec *timeout = NULL, int flag = 0); /** * 鍙戝竷涓婚 * @topic 涓婚 * @content 涓婚鍐呭 * @key 鎬荤嚎绔彛 + * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG */ - int pub(char *topic, int topic_size, void *content, int content_size, int key); - // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, struct timespec *timeout); - int pub_nowait(char *topic, int topic_size, void *content, int content_size, int key); + int pub(const char *topic, int topic_size, const void *content, int content_size, int key, const struct timespec *timeout = NULL, int flag = 0); /** -- Gitblit v1.8.0