From 9b29a67af93e4ab9948cc60f743d73c4bb39e738 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 20 十月 2020 16:46:55 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 4807a69..4e4394c 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -3,12 +3,15 @@
#include "usg_common.h"
#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 NET_MODE_REQUEST_HEAD_LENGTH 16
-#define NET_MODE_RESPONSE_HEAD_LENGTH 4
+
+
+
class NetModServerSocket;
@@ -19,24 +22,32 @@
int key;
};
+#define NET_MODE_REQUEST_HEAD_LENGTH (NI_MAXHOST + 5 * 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;
};
+#define NET_MODE_RESPONSE_HEAD_LENGTH (NI_MAXHOST + 4 * sizeof(uint32_t))
+
struct net_mod_response_head_t {
// socket_mod_t mod;
- // int key;
+ char host[NI_MAXHOST];
+ uint32_t port;
+ uint32_t key;
+ uint32_t code;
uint32_t content_length;
};
struct net_mod_recv_msg_t
{
- char host[128];
+ char host[NI_MAXHOST];
int port;
int key;
void *content;
@@ -45,10 +56,23 @@
};
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:
- 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 +80,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 +99,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