From c479ef57baaaa28964fc3ec8d80ff99dffa7d49f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期三, 10 十一月 2021 09:49:29 +0800
Subject: [PATCH] Fix the system hang issue when the app is killed contantly.
---
src/net/net_mod_socket.h | 93 +++++++++++++++++++---------------------------
1 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/src/net/net_mod_socket.h b/src/net/net_mod_socket.h
index 11e0ebe..bef1783 100644
--- a/src/net/net_mod_socket.h
+++ b/src/net/net_mod_socket.h
@@ -3,6 +3,7 @@
#include "usg_common.h"
#include "shm_mod_socket.h"
#include "socket_io.h"
+#include "proc_def.h"
#include <poll.h>
#include "socket_def.h"
#include "net_conn_pool.h"
@@ -17,7 +18,7 @@
int key;
};
-#define NET_MODE_REQUEST_HEAD_LENGTH (NI_MAXHOST + 6 * sizeof(uint32_t))
+#define NET_MODE_REQUEST_HEAD_LENGTH sizeof(net_mod_request_head_t)
// 璇锋眰澶�
@@ -55,6 +56,14 @@
};
+struct net_mod_err_t
+{
+ char host[NI_MAXHOST];
+ int port;
+ int key;
+ int code;
+};
+
class NetModSocket {
@@ -62,7 +71,9 @@
private:
ShmModSocket shmModSocket;
-
+ int int_val;
+ int svr_val;
+ std::map<std::string, int> recvbuf;
// pthread_mutex_t sendMutex;
// request header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
@@ -83,14 +94,13 @@
NetConnPool* _get_pool();
//璇诲彇杩斿洖淇℃伅
- int read_response(int clientfd, net_mod_recv_msg_t *recv_msg);
+ int read_response(int clientfd, net_mod_recv_msg_t *recv_msg, net_mod_err_t *err_arr);
// 鍙戦�佽姹備俊鎭�
- 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 write_request(int clientfd, net_mod_request_head_t &request_head, const void *send_buf, int send_size, const 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) ;
+
+ int _pub_(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size, int timeout) ;
public:
@@ -98,7 +108,7 @@
NetModSocket();
~NetModSocket();
-
+ int stop();
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -111,24 +121,8 @@
*/
int force_bind( int key);
-
-
- /**
- * @brief 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
- *
- * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
- * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�.濡傛灉IP涓虹┖鍒欎负鏈湴鍙戦�併��
- * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
- * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
- * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
- * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
- *
- * 浼樼偣锛�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) ;
-
-
+ int reg(void *pData, int len, void **buf, int *size, const int timeout_ms, int flag);
+
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
@@ -139,16 +133,14 @@
* @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
* 浼樼偣锛�1鏌愪釜鑺傜偣鐨勬晠闅滀笉浼氶樆濉炲叾浠栬妭鐐广��2 鎬ц兘濂姐�� 3 閲囩敤thread local鎶�鏈嵆淇濊瘉浜嗙嚎绋嬪畨鍏紝鍙堝彲浠ヤ娇鐢ㄨ繛鎺ユ睜缂撳瓨杩炴帴
*/
- 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);
-
- /**
- * 涓嶇瓑寰呯珛鍗宠繑鍥�
- * @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) ;
-
+ 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,
+ net_mod_err_t ** _err_arr, int *_err_arr_size, int timeout);
+
+ void int_set(int data);
+ void svr_set(int data);
+ int int_get(void);
+ int svr_get(void);
/**
* 鍔熻兘鍚宻endandrecv
* 浼樼偣锛氱嚎绋嬪畨鍏�
@@ -158,27 +150,26 @@
// 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);
-
/**
* 鍙戦�佷俊鎭�
* @key 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int sendto( const void *buf, const int size, const int key);
+ int sendto( const void *buf, const int size, const int key, int reset = 0, int data_set = 0);
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
- int sendto_timeout( const void *buf, const int size, const int key, int sec, int nsec);
+ int sendto_timeout( const void *buf, const int size, const int key, int sec, int nsec, int reset = 0, int data_set = 0);
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
- int sendto_nowait( const void *buf, const int size, const int key);
+ int sendto_nowait( const void *buf, const int size, const int key, int reset = 0, int data_set = 0);
/**
* 鎺ユ敹淇℃伅
* @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
- int recvfrom( void **buf, int *size, int *key);
+ int recvfrom( void **buf, int *size, int *key, int reset = 0, int data_set = 0);
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
- int recvfrom_timeout( void **buf, int *size, int *key, int sec, int nsec);
- int recvfrom_nowait( void **buf, int *size, int *key);
+ int recvfrom_timeout( void **buf, int *size, int *key, int sec, int nsec, int reset = 0, int data_set = 0);
+ int recvfrom_nowait( void **buf, int *size, int *key, int reset = 0, int data_set = 0);
/**
* 鏈湴鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
@@ -189,9 +180,6 @@
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int sendandrecv_timeout( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, int sec, int nsec) ;
int sendandrecv_nowait( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size) ;
-
-
-
/**
* recvandsend
@@ -206,13 +194,13 @@
* @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(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const 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);
+ int pub_nowait(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const 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);
+ int pub_timeout(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size, int msec);
/**
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
@@ -248,10 +236,6 @@
int pub_nowait( char *topic, int topic_size, void *content, int content_size, int key);
-
-
-
-
/**
* 鑾峰彇soket key
*/
@@ -264,7 +248,8 @@
*/
static void free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size);
-
+ void buf_data_set(std::string str, int val);
+ int buf_data_get(std::string str);
};
#endif
\ No newline at end of file
--
Gitblit v1.8.0