From 8c42a659c0cc9178d1f1305acb41dfbf4a8697ef Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 22 十月 2020 16:20:26 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 4ace2bb..0988f1b 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -3,6 +3,17 @@
#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))
+
+
+
+
+
+class NetModServerSocket;
struct net_node_t
{
@@ -11,46 +22,115 @@
int key;
};
+#define NET_MODE_REQUEST_HEAD_LENGTH (NI_MAXHOST + 5 * sizeof(uint32_t))
struct net_mod_request_head_t {
- socket_mod_t mod;
- int key;
+ 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;
- uint32_t content_length;
+ int content_length;
};
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);
+ 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);
+ 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);
+
+
public:
NetModSocket();
- int sendandrecv(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
- net_mod_recv_msg_t ** resp_arr, int *resp_arr_size);
-
~NetModSocket();
- static void free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size);
+ /**
+ * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+ * @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 娑堟伅缁勭殑闀垮害
+ */
+ static void free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size);
+
+ /**
+ * 鍚憂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);
+
+
};
-
-
#endif
\ No newline at end of file
--
Gitblit v1.8.0