From f462d191f5ded9f9992837862fd97f5c1a536bce Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 01 十二月 2020 16:49:33 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 169 +++++++++++++++++++++++++++++--------------------------
1 files changed, 89 insertions(+), 80 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 80e98cc..5f20ee9 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -5,12 +5,12 @@
#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 GET_INT32(p) (*(int32_t *)(p))
+#define PUT_INT32(p, val) (*(int32_t *)(p) = (val))
class NetModServerSocket;
@@ -22,25 +22,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;
};
@@ -56,39 +61,38 @@
};
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];
- // net_node_t *nodes[FD_SETSIZE];
- // rio_t clientrio[FD_SETSIZE]; /* Set of active read buffers */
- // std::map<int, net_node_t*> connfdNodeMap;
- std::map<std::string, int> connectionMap;
- } ;
+
friend class NetModServerSocket;
private:
ShmModSocket shmModSocket;
- pool req_resp_pool;
+ // pool req_resp_pool;
-
+ // 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_req_rep_req_resp_pool();
- int connect( net_node_t*);
- void close_connect(int connfd);
+ // 閿�姣乼hreadlocal pool
+ static void _destroyConnPool_(void *_pool);
+ // 鍒涘缓thread local key
+ static void _createKey_(void);
+
+ //璇诲彇杩斿洖淇℃伅
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:
@@ -100,13 +104,13 @@
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int bind( int port);
+ int bind( int key);
/**
* 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int force_bind( int port);
+ int force_bind( int key);
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅浼氫竴鐩寸瓑寰�
@@ -124,7 +128,7 @@
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
* @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
*/
- int sendandrecv_timout(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
+ 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);
/**
@@ -144,40 +148,36 @@
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size);
-
-
-
-
/**
* 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendto( const void *buf, const int size, const int port);
+ int sendto( const void *buf, const int size, const int key);
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
- int sendto_timeout( const void *buf, const int size, const int port, int sec, int nsec);
+ int sendto_timeout( const void *buf, const int size, const int key, int sec, int nsec);
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
- int sendto_nowait( const void *buf, const int size, const int port);
+ int sendto_nowait( const void *buf, const int size, const int key);
/**
* 鎺ユ敹淇℃伅
- * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int recvfrom( void **buf, int *size, int *port);
+ int recvfrom( void **buf, int *size, int *key);
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int recvfrom_timeout( void **buf, int *size, int *port, int sec, int nsec);
- int recvfrom_nowait( void **buf, int *size, int *port);
+ int recvfrom_timeout( void **buf, int *size, int *key, int sec, int nsec);
+ int recvfrom_nowait( void **buf, int *size, int *key);
/**
* 鏈湴鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendandrecv( const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size) ;
+ int sendandrecv( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size) ;
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sendandrecv_timeout( const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size, int sec, int nsec) ;
- int sendandrecv_nowait( const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size) ;
+ 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) ;
/**
@@ -187,42 +187,7 @@
*/
int start_bus();
- /**
- * 璁㈤槄鎸囧畾涓婚
- * @topic 涓婚
- * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
- */
- int sub( void *topic, int size, int port);
- // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int sub_timeout( void *topic, int size, int port, int sec, int nsec);
- int sub_nowait( void *topic, int size, int port);
-
- /**
- * 鍙栨秷璁㈤槄鎸囧畾涓婚
- * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
- * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
- */
- int desub( void *topic, int size, int port);
- // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int desub_timeout( void *topic, int size, int port, int sec, int nsec);
- int desub_nowait( void *topic, int size, int port);
-
- /**
- * 鍙戝竷涓婚
- * @topic 涓婚
- * @content 涓婚鍐呭
- * @port 鎬荤嚎绔彛
- */
- int pub( char *topic, int topic_size, void *content, int content_size, int port);
- // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int pub_timeout( char *topic, int topic_size, void *content, int content_size, int port, int sec, int nsec);
- int pub_nowait( char *topic, int topic_size, void *content, int content_size, int port);
-
-
-
/**
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
* @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
@@ -230,12 +195,56 @@
* @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);
+ 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);
+ /**
+ * @msec 姣 锛堝崈鍒嗕箣涓�绉掞級
+ */
+ int pub_timeout(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int msec);
+ /**
+ * 璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚
+ * @size 涓婚闀垮害
+ * @key 鎬荤嚎绔彛
+ */
+ int sub( void *topic, int size, int key);
+ // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+ int sub_timeout( void *topic, int size, int key, int sec, int nsec);
+ int sub_nowait( void *topic, int size, int key);
+
/**
- * 鑾峰彇soket绔彛鍙�
+ * 鍙栨秷璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
+ * @size 涓婚闀垮害
+ * @key 鎬荤嚎绔彛
*/
- int get_port() ;
+ int desub( void *topic, int size, int key);
+ // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+ int desub_timeout( void *topic, int size, int key, int sec, int nsec);
+ int desub_nowait( void *topic, int size, int key);
+
+ /**
+ * 鍙戝竷涓婚
+ * @topic 涓婚
+ * @content 涓婚鍐呭
+ * @key 鎬荤嚎绔彛
+ */
+ 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, int sec, int nsec);
+ int pub_nowait( char *topic, int topic_size, void *content, int content_size, int key);
+
+
+
+
+
+
+ /**
+ * 鑾峰彇soket key
+ */
+ int get_key() ;
/**
* 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍
--
Gitblit v1.8.0