From caecfd9123e17b916c1e6e79f967afb3cdeaa0bb Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 01 十二月 2020 09:51:00 +0800
Subject: [PATCH] sendandrev reentry
---
src/socket/net_mod_socket.h | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index dfb7c11..5e7b7b7 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -9,9 +9,8 @@
#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 +21,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;
};
@@ -61,17 +65,14 @@
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;
+ // std::map<std::string, int> connectionMap;
} ;
friend class NetModServerSocket;
private:
ShmModSocket shmModSocket;
- pool req_resp_pool;
+ // pool req_resp_pool;
@@ -81,14 +82,17 @@
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);
+ void init_conn_pool( pool& mpool);
+ int connect(pool& mpool, net_node_t* node);
+ void close_connect(pool& mpool , 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);
+ 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:
@@ -144,10 +148,6 @@
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size);
-
-
-
-
/**
* 鍙戦�佷俊鎭�
* @key 鍙戦�佺粰璋�
@@ -187,6 +187,21 @@
*/
int start_bus();
+
+ /**
+ * 鍚憂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);
+ /**
+ * @msec 姣 锛堝崈鍒嗕箣涓�绉掞級
+ */
+ int pub_timeout(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int msec);
/**
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
@@ -223,14 +238,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