From af85260254bacac40a68d4f5f61950523beb3a27 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 19 十月 2020 17:02:41 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 4807a69..c133302 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -7,8 +7,9 @@
#define GET(p) (*(uint32_t *)(p))
#define PUT(p, val) (*(uint32_t *)(p) = (val))
-#define NET_MODE_REQUEST_HEAD_LENGTH 16
-#define NET_MODE_RESPONSE_HEAD_LENGTH 4
+
+
+
class NetModServerSocket;
@@ -19,6 +20,7 @@
int key;
};
+#define NET_MODE_REQUEST_HEAD_LENGTH 16
struct net_mod_request_head_t {
uint32_t mod;
@@ -27,9 +29,12 @@
uint32_t topic_length;
};
+#define NET_MODE_RESPONSE_HEAD_LENGTH 8
+
struct net_mod_response_head_t {
// socket_mod_t mod;
// int key;
+ uint32_t code;
uint32_t content_length;
};
@@ -45,10 +50,32 @@
};
class NetModSocket {
+ struct pool{ /* Represents a pool of connected descriptors */ //line:conc:echoservers:beginpool
+ int maxfd; /* Largest descriptor in read_set */
+ fd_set read_set; /* Set of all active descriptors */
+ fd_set ready_read_set; /* Subset of descriptors ready for reading */
+
+ fd_set write_set;
+ fd_set ready_write_set;
+
+ fd_set except_set;
+ fd_set ready_except_set;
+
+ int nready; /* Number of ready descriptors from select */
+ int maxi; /* Highwater index into client array */
+ int connfd[FD_SETSIZE]; /* Set of active descriptors */
+ // 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:
- static std::map<std::string, rio_t *> connectionMap;
- ShmModSocket shmModSocket;
+
+ ShmModSocket shmModSocket;
+ pool req_resp_pool;
+
static void * encode_request_head(net_mod_request_head_t & request);
@@ -56,6 +83,13 @@
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);
+ int read_response(int clientfd, net_mod_recv_msg_t *recv_msg);
+ int write_request(int clientfd, int key, void *send_buf, int send_size);
+
public:
@@ -68,11 +102,22 @@
* @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
* @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
* @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
+ * 浼樼偣锛氭棤闃诲锛屾�ц兘濂�
+ * 缂虹偣锛氫笉鏄嚎绋嬪畨鍏ㄧ殑
*/
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);
/**
+ * 鍔熻兘鍚宻endandrecv
+ * 浼樼偣锛氱嚎绋嬪畨鍏�
+ * 缂虹偣锛氶樆濉炵殑锛屾�ц兘涓嶅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);
+
+ /**
* 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍
* @arr 娑堟伅缁�
* @size 娑堟伅缁勭殑闀垮害
--
Gitblit v1.8.0