From aa2f3b2a9968bb4928463bdae05fb026d16b60bb Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 04 十二月 2020 19:07:01 +0800
Subject: [PATCH] 固定bus key

---
 src/socket/net_mod_socket.h |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/socket/net_mod_socket.h b/src/socket/net_mod_socket.h
index 5e7b7b7..55739d2 100644
--- a/src/socket/net_mod_socket.h
+++ b/src/socket/net_mod_socket.h
@@ -5,12 +5,13 @@
 #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 GET_INT32(p)       (*(int32_t *)(p))
 #define PUT_INT32(p, val)  (*(int32_t *)(p) = (val))
+
 
 class NetModServerSocket;
 
@@ -60,13 +61,7 @@
 };
 
 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];
-    // std::map<std::string, int> connectionMap;
-  } ; 
+ 
 
   friend class NetModServerSocket;
 private:
@@ -75,17 +70,22 @@
   // pool req_resp_pool;
  
 
-
+  // request header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
   static void * encode_request_head(net_mod_request_head_t & request);
+  // 瑙g爜request  header
   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_conn_pool( pool& mpool);
-  int connect(pool& mpool, net_node_t* node);
-  void close_connect(pool& mpool , int connfd);
+  // 閿�姣乼hreadlocal pool
+  static void _destroyConnPool_(void *_pool);
+  // 鍒涘缓thread local key
+  static void _createConnPoolKey_(void);
+
+  //璇诲彇杩斿洖淇℃伅
   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, void *topic_buf, int topic_size);
 
   int _sendandrecv_(net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size, 
@@ -115,12 +115,11 @@
   /**
    * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅浼氫竴鐩寸瓑寰�
    * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
-   * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+   * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�.濡傛灉IP涓虹┖鍒欎负鏈湴鍙戦�併��
    * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
    * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
    * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
-   * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2鎬ц兘濂�
-   * 缂虹偣锛氫笉鏄嚎绋嬪畨鍏ㄧ殑, 鍗充笉鑳芥湁涓や釜浠ヤ笂鐨勭嚎绋嬪悓鏃朵娇鐢ㄨ繖涓璞$殑鏂规硶
+   * 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2 鎬ц兘濂姐�� 3 閲囩敤thread local鎶�鏈嵆淇濊瘉浜嗙嚎绋嬪畨鍏紝鍙堝彲浠ヤ娇鐢ㄨ繛鎺ユ睜缂撳瓨杩炴帴
    */
   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) ;

--
Gitblit v1.8.0