From 6a1a06f1506b88b769955ddc57035cf166f64ef4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 22 一月 2021 17:59:18 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 46 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index df5aa7f..612f784 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -4,15 +4,8 @@
#include "shm_mod_socket.h"
#include "socket_io.h"
#include <poll.h>
-
-#define OPEN_MAX 1024
-#define GET(p) (*(uint32_t *)(p))
-#define PUT(p, val) (*(uint32_t *)(p) = (val))
-
-
-#define ERROR_NET_MOD_SOCKET_ADDR_IN_USE 1
-
-
+#include "socket_def.h"
+#include "net_conn_pool.h"
class NetModServerSocket;
@@ -24,25 +17,30 @@
int key;
};
-#define NET_MODE_REQUEST_HEAD_LENGTH (NI_MAXHOST + 5 * sizeof(uint32_t))
+#define NET_MODE_REQUEST_HEAD_LENGTH (NI_MAXHOST + 6 * sizeof(uint32_t))
+
+// 璇锋眰澶�
struct net_mod_request_head_t {
uint32_t mod;
char host[NI_MAXHOST];
uint32_t port;
uint32_t key;
- uint32_t content_length;
- uint32_t topic_length;
+ uint32_t content_length; // 璇锋眰鍐呭
+ uint32_t topic_length; // 璇锋眰涓婚
+ int32_t timeout; // -1 block, 0 nowait , > 0 timeout
};
#define NET_MODE_RESPONSE_HEAD_LENGTH (NI_MAXHOST + 4 * sizeof(uint32_t))
+
+// 搴旂瓟澶�
struct net_mod_response_head_t {
// socket_mod_t mod;
char host[NI_MAXHOST];
uint32_t port;
uint32_t key;
- uint32_t code;
+ uint32_t code; //杩斿洖鍊�, 0 涓烘垚鍔�
uint32_t content_length;
};
@@ -58,37 +56,43 @@
};
class NetModSocket {
- struct pool{ /* Represents a pool of connected descriptors */ //line:conc:echoservers:beginpool
-
- int nready; /* Number of ready descriptors from select */
- int maxi; /* Highwater index into client array */
- struct pollfd conns[OPEN_MAX];
- // std::map<std::string, int> connectionMap;
- } ;
+
friend class NetModServerSocket;
private:
ShmModSocket shmModSocket;
// pool req_resp_pool;
-
+ NetConnPool *gpool;
+ pthread_mutex_t sendMutex;
+ // request header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
static void * encode_request_head(net_mod_request_head_t & request);
+ // 瑙ｇ爜request header
static net_mod_request_head_t decode_request_head(void *headbs);
static void * encode_response_head(net_mod_response_head_t & response);
static net_mod_response_head_t decode_response_head(void *_headbs);
- void init_conn_pool( pool& mpool);
- int connect(pool& mpool, net_node_t* node);
- void close_connect(pool& mpool , int connfd);
+ // 閿�姣乼hreadlocal pool
+ static void _destroyConnPool_(void *_pool);
+ // 鍒涘缓thread local key
+ static void _createConnPoolKey_(void);
+
+
+ NetConnPool* _get_threadlocal_pool();
+ NetConnPool* _get_pool();
+
+ //璇诲彇杩斿洖淇℃伅
int read_response(int clientfd, net_mod_recv_msg_t *recv_msg);
- int write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size);
+ // 鍙戦�佽姹備俊鎭�
+ int write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size, void *topic_buf, int topic_size);
int _sendandrecv_(net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int timeout);
+ int _pub_(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int timeout) ;
public:
@@ -109,22 +113,34 @@
*/
int force_bind( int key);
+
+
/**
- * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅浼氫竴鐩寸瓑寰�
+ * @brief 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
+ *
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
- * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�.濡傛灉IP涓虹┖鍒欎负鏈湴鍙戦�併��
* @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
* @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
+ * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
* @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
- * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2鎬ц兘濂�
- * 缂虹偣锛氫笉鏄嚎绋嬪畨鍏ㄧ殑, 鍗充笉鑳芥湁涓や釜浠ヤ笂鐨勭嚎绋嬪悓鏃朵娇鐢ㄨ繖涓璞＄殑鏂规硶
+ *
+ * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2 鎬ц兘濂姐�� 3 閲囩敤thread local鎶�鏈嵆淇濊瘉浜嗙嚎绋嬪畨鍏紝鍙堝彲浠ヤ娇鐢ㄨ繛鎺ユ睜缂撳瓨杩炴帴
*/
int sendandrecv(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ;
+
+
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
+ * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�.濡傛灉IP涓虹┖鍒欎负鏈湴鍙戦�併��
+ * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
+ * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
* @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
- */
+ * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
+ * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2 鎬ц兘濂姐�� 3 閲囩敤thread local鎶�鏈嵆淇濊瘉浜嗙嚎绋嬪畨鍏紝鍙堝彲浠ヤ娇鐢ㄨ繛鎺ユ睜缂撳瓨杩炴帴
+ */
int sendandrecv_timeout(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int timeout);
@@ -141,8 +157,8 @@
* 缂虹偣锛氶樆濉炵殑锛屾�ц兘涓嶅sendandrecv
*
*/
- int sendandrecv_safe(net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size,
- net_mod_recv_msg_t ** recv_arr, int *recv_arr_size);
+ // int sendandrecv_safe(net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size,
+ // net_mod_recv_msg_t ** recv_arr, int *recv_arr_size);
/**
@@ -176,14 +192,21 @@
int sendandrecv_timeout( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, int sec, int nsec) ;
int sendandrecv_nowait( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size) ;
+
+ /**
+ * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+ * @topic 涓婚锛孈topic_size 璇ヤ富棰樼殑闀垮害
+ * @content 鍐呭锛孈content_size 鍐呭闀垮害
+ * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟
+ */
+ int pub(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size) ;
+ int pub_nowait(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size);
/**
- * 鍚姩bus
- *
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
- */
- int start_bus();
-
+ * @msec 姣 锛堝崈鍒嗕箣涓�绉掞級
+ */
+ int pub_timeout(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int msec);
/**
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
@@ -220,14 +243,8 @@
- /**
- * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
- * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
- * @topic 涓婚锛孈topic_size 璇ヤ富棰樼殑闀垮害
- * @content 鍐呭锛孈content_size 鍐呭闀垮害
- * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟
- */
- int pub(net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size);
+
+
/**
* 鑾峰彇soket key
--
Gitblit v1.8.0