From a856e56b3943041d64a22285c550f6dbb9d2e193 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 27 十一月 2020 15:53:43 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.h | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 168 insertions(+), 12 deletions(-)
diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 4807a69..febb429 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);
@@ -57,27 +81,147 @@
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);
+
+ 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);
+
public:
NetModSocket();
~NetModSocket();
+
/**
+ * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ int bind( int port);
+
+ /**
+ * 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ int force_bind( int port);
+
+ /**
+ * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅浼氫竴鐩寸瓑寰�
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
* @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
* @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
* @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
* @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
+ * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2鎬ц兘濂�
+ * 缂虹偣锛氫笉鏄嚎绋嬪畨鍏ㄧ殑, 鍗充笉鑳芥湁涓や釜浠ヤ笂鐨勭嚎绋嬪悓鏃朵娇鐢ㄨ繖涓璞＄殑鏂规硶
*/
- 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 sendandrecv(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
+ net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ;
+ /**
+ * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
+ * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
+ */
+ 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);
/**
- * 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍
- * @arr 娑堟伅缁�
- * @size 娑堟伅缁勭殑闀垮害
+ * 涓嶇瓑寰呯珛鍗宠繑鍥�
+ * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
+ */
+ int sendandrecv_nowait(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
+ net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ;
+
+ /**
+ * 鍔熻兘鍚宻endandrecv
+ * 浼樼偣锛氱嚎绋嬪畨鍏�
+ * 缂虹偣锛氶樆濉炵殑锛屾�ц兘涓嶅sendandrecv
+ *
*/
- static void free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size);
+ 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);
+
+
+
+
+
+
+ /**
+ * 鍙戦�佷俊鎭�
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ int sendto( const void *buf, const int size, const int port);
+ // 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
+ int sendto_timeout( const void *buf, const int size, const int port, int sec, int nsec);
+ // 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
+ int sendto_nowait( const void *buf, const int size, const int port);
+
+ /**
+ * 鎺ユ敹淇℃伅
+ * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ int recvfrom( void **buf, int *size, int *port);
+ // 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+ int recvfrom_timeout( void **buf, int *size, int *port, int sec, int nsec);
+ int recvfrom_nowait( void **buf, int *size, int *port);
+
+ /**
+ * 鏈湴鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ int sendandrecv( const void *send_buf, const int send_size, const int send_port, 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) ;
+
+
+ /**
+ * 鍚姩bus
+ *
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+ 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 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
@@ -87,6 +231,18 @@
* @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟
*/
int pub(net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size);
+
+ /**
+ * 鑾峰彇soket key
+ */
+ int get_key() ;
+
+ /**
+ * 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍
+ * @arr 娑堟伅缁�
+ * @size 娑堟伅缁勭殑闀垮害
+ */
+ static void free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size);
};
--
Gitblit v1.8.0