From abc89da58e0a321fc4d27d0ca70620cd14141d3a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 01 十二月 2020 15:34:35 +0800
Subject: [PATCH] thread local, thread pool , thread safe

---
 src/socket/net_mod_socket_wrapper.h |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h
index ff5915d..a2f82e1 100644
--- a/src/socket/net_mod_socket_wrapper.h
+++ b/src/socket/net_mod_socket_wrapper.h
@@ -12,6 +12,8 @@
 	NetModSocket *sockt;
 };
 
+
+
 /**
  * 鍒涘缓
  */
@@ -28,34 +30,34 @@
  * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_bind(void * _socket, int port);
+int net_mod_socket_bind(void * _socket, int key);
 
 /**
  * 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_force_bind(void * _socket, int port);
+int net_mod_socket_force_bind(void * _socket, int key);
 
 /**
  * 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
  */
-int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int port);
+int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int key);
 // 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec);
+int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int key, int sec, int nsec);
 // 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
-int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int port);
+int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key);
 
 /**
  * 鎺ユ敹淇℃伅
- * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *port);
+int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *key);
 // 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec);
-int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *port);
+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);
 
 
   
@@ -101,31 +103,34 @@
  * @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);
-
-
+/*
+ * @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);
 
 /**
  * 璁㈤槄鎸囧畾涓婚
  * @topic 涓婚
  * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
  */
-int  net_mod_socket_sub(void * _socket, void *topic, int size, int port);
+int  net_mod_socket_sub(void * _socket, void *topic, int size, int key);
 // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int  net_mod_socket_sub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec);
-int  net_mod_socket_sub_nowait(void * _socket, void *topic, int size, int port);
+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);
 
 
 /**
  * 鍙栨秷璁㈤槄鎸囧畾涓婚
  * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
  * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
  */
 int  net_mod_socket_desub(void * _socket, void *topic, int size, int key);
 // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int  net_mod_socket_desub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec);
-int  net_mod_socket_desub_nowait(void * _socket, void *topic, int size, int port);
+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);
 
 
 /**
@@ -147,6 +152,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