From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 22 十二月 2020 19:21:55 +0800 Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况 --- src/socket/net_mod_socket_wrapper.h | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h index 9bbdb21..7f37b28 100644 --- a/src/socket/net_mod_socket_wrapper.h +++ b/src/socket/net_mod_socket_wrapper.h @@ -12,6 +12,8 @@ NetModSocket *sockt; }; + + /** * 鍒涘缓 */ @@ -57,17 +59,14 @@ int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec); int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key); - - /** * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅浼氫竴鐩寸瓑寰� * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓� - * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴� + * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�.濡傛灉IP涓虹┖鍒欎负鏈湴鍙戦�併�� * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴� * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴� * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁� - * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2鎬ц兘濂� - * 缂虹偣锛氫笉鏄嚎绋嬪畨鍏ㄧ殑, 鍗充笉鑳芥湁涓や釜浠ヤ笂鐨勭嚎绋嬪悓鏃朵娇鐢ㄨ繖涓璞＄殑鏂规硶 + * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2 鎬ц兘濂姐�� 3 閲囩敤thread local鎶�鏈嵆淇濊瘉浜嗙嚎绋嬪畨鍏紝鍙堝彲浠ヤ娇鐢ㄨ繛鎺ユ睜缂撳瓨杩炴帴 */ int net_mod_socket_sendandrecv(void *_sockt, net_node_t *node_arr, int arrlen, void *send_buf, int send_size, net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ; @@ -85,13 +84,6 @@ net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ; -/** - * 鍚姩bus - * - * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 -*/ -int net_mod_socket_start_bus(void * _socket); - /** * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭� @@ -101,7 +93,10 @@ * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟 */ int net_mod_socket_pub(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size); -int net_mod_socket_pub_timeout(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size, int timeout); +/* + * @msec 姣锛堝崈鍒嗕箣涓�绉掞級 + */ +int net_mod_socket_pub_timeout(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size, int msec); int net_mod_socket_pub_nowait(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size); /** @@ -110,10 +105,10 @@ * @size 涓婚闀垮害 * @key 鎬荤嚎绔彛 */ -int net_mod_socket_sub(void * _socket, void *topic, int size, int key); +int net_mod_socket_sub(void * _socket, void *topic, int size); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 -int net_mod_socket_sub_timeout(void * _socket, void *topic, int size, int key, int sec, int nsec); -int net_mod_socket_sub_nowait(void * _socket, void *topic, int size, int key); +int net_mod_socket_sub_timeout(void * _socket, void *topic, int size, int sec, int nsec); +int net_mod_socket_sub_nowait(void * _socket, void *topic, int size); /** @@ -122,10 +117,10 @@ * @size 涓婚闀垮害 * @key 鎬荤嚎绔彛 */ -int net_mod_socket_desub(void * _socket, void *topic, int size, int key); +int net_mod_socket_desub(void * _socket, void *topic, int size); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 -int net_mod_socket_desub_timeout(void * _socket, void *topic, int size, int key, int sec, int nsec); -int net_mod_socket_desub_nowait(void * _socket, void *topic, int size, int key); +int net_mod_socket_desub_timeout(void * _socket, void *topic, int size, int sec, int nsec); +int net_mod_socket_desub_nowait(void * _socket, void *topic, int size); /** @@ -147,6 +142,17 @@ */ void net_mod_socket_free(void *buf) ; + +/** + * 鍒犻櫎key瀵瑰簲鐨勫叡浜槦鍒楋紝骞跺湪bus閲屽垹闄よkey鐨勮闃� + */ +int shm_mod_socket_remove_key(int key); + +/** + * 鎵归噺鍒犻櫎key瀵瑰簲鐨勫叡浜槦鍒楋紝骞跺湪bus閲屽垹闄よkey鐨勮闃� + */ +int shm_mod_socket_remove_keys(int keys[], int length); + #ifdef __cplusplus } #endif -- Gitblit v1.8.0