From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/net/net_mod_socket.cpp | 232 +++++++++++++++++++++++----------------------------------
1 files changed, 93 insertions(+), 139 deletions(-)
diff --git a/src/net/net_mod_socket.cpp b/src/net/net_mod_socket.cpp
index 73be131..2932d8c 100644
--- a/src/net/net_mod_socket.cpp
+++ b/src/net/net_mod_socket.cpp
@@ -15,39 +15,20 @@
NetModSocket::NetModSocket()
{
- int s;
if (Signal(SIGPIPE, SIG_IGN) == SIG_ERR)
- logger->error(errno, "NetModSocket::NetModSocket signal");
-
- gpool = new NetConnPool();
-
- pthread_mutexattr_t mtxAttr;
- s = pthread_mutexattr_init(&mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_init");
- s = pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_ERRORCHECK);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_settype");
- s = pthread_mutex_init(&sendMutex, &mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutex_init");
-
- s = pthread_mutexattr_destroy(&mtxAttr);
- if (s != 0)
- err_exit(s, "pthread_mutexattr_destroy");
+ logger->error(errno, "NetModSocket::NetModSocket signal");
}
NetModSocket::~NetModSocket() {
- int s;
- delete gpool;
- s = pthread_mutex_destroy(&sendMutex);
- if(s != 0) {
- err_exit(s, "shm_close_socket");
- }
+
}
+
+int NetModSocket::stop() {
+ return shmModSocket.stop();
+}
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
@@ -141,20 +122,23 @@
}
+
+
int NetModSocket::_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 msec ) {
- int i, n, recv_size, connfd;
+ int i, recv_size, connfd;
net_node_t *node;
void *recv_buf = NULL;
struct timespec timeout;
int ret;
- int n_req = 0, n_recv_suc = 0, n_resp =0;
+ int n_req = 0, n_recv_suc = 0, n_recv_err = 0, n_resp =0;
net_mod_request_head_t request_head = {};
net_mod_recv_msg_t *ret_arr = (net_mod_recv_msg_t *)calloc(arrlen, sizeof(net_mod_recv_msg_t));
+ net_mod_recv_err_t err_arr[arrlen];
NetConnPool *mpool = _get_pool();
@@ -165,14 +149,15 @@
// 鏈湴鍙戦��
if(msec == 0) {
- ret = shmModSocket.sendandrecv_nowait(send_buf, send_size, node->key, &recv_buf, &recv_size);
+ ret = shmModSocket.sendandrecv(send_buf, send_size, node->key, &recv_buf, &recv_size, NULL, BUS_NOWAIT_FLAG);
} else if(msec > 0){
timeout.tv_sec = msec / 1000;
timeout.tv_nsec = (msec - timeout.tv_sec * 1000) * 10e6;
- ret = shmModSocket.sendandrecv_timeout(send_buf, send_size, node->key, &recv_buf, &recv_size, &timeout);
+ ret = shmModSocket.sendandrecv(send_buf, send_size, node->key, &recv_buf, &recv_size, &timeout, BUS_TIMEOUT_FLAG);
} else {
ret = shmModSocket.sendandrecv(send_buf, send_size, node->key, &recv_buf, &recv_size);
}
+
if( ret == 0) {
strcpy( ret_arr[n_recv_suc].host, "");
ret_arr[n_recv_suc].port = 0;
@@ -181,13 +166,11 @@
ret_arr[n_recv_suc].content_length = recv_size;
n_recv_suc++;
} else {
- if(ret > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket:: %d _sendandrecv_ to key %d failed, %s", get_key(), node->key, bus_strerror(ret));
-
- } else {
- logger->error(ret, "NetModSocket:: %d _sendandrecv_ to key %d failed", get_key(), node->key);
- }
+ err_arr[n_recv_err].port = 0;
+ err_arr[n_recv_err].key = node->key;
+ err_arr[n_recv_err].code = ret;
+ n_recv_err++;
+ logger->error("NetModSocket:: _sendandrecv_ to key %d failed. %s", node->key, bus_strerror(ret));
}
@@ -195,6 +178,11 @@
}
if( (connfd = mpool->getConn(node->host, node->port)) < 0 ) {
+ memcpy(err_arr[n_recv_err].host, node->host, sizeof(err_arr[n_recv_err].host));
+ err_arr[n_recv_err].port = node->port;
+ err_arr[n_recv_err].key = node->key;
+ err_arr[n_recv_err].code = EBUS_NET;
+ n_recv_err++;
continue;
}
@@ -209,6 +197,11 @@
// printf("write_request %s:%d\n", request_head.host, request_head.port);
if(write_request(connfd, request_head, send_buf, send_size, NULL, 0) != 0) {
LoggerFactory::getLogger()->error("write_request failture %s:%d\n", node->host, node->port);
+ memcpy(err_arr[n_recv_err].host, node->host, sizeof(err_arr[n_recv_err].host));
+ err_arr[n_recv_err].port = node->port;
+ err_arr[n_recv_err].key = node->key;
+ err_arr[n_recv_err].code = EBUS_NET;
+ n_recv_err++;
mpool->closeConn( connfd);
} else {
n_req++;
@@ -234,19 +227,25 @@
{
mpool->nready--;
// printf("POLLIN %d\n", connfd);
- if( (n = read_response(connfd, ret_arr+n_recv_suc)) == 0) {
+ if( (ret = read_response(connfd, ret_arr+n_recv_suc, err_arr + n_recv_err)) == 0) {
n_recv_suc++;
// 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
mpool->conns[i].fd = -1;
}
- else if(n == EBUS_NET) {
+ else if(ret == EBUS_NET) {
// 缃戠粶閿欒
+
+ logger->error("NetModSocket::_sendandrecv_ read_response key = %d , %s", get_key(), bus_strerror(ret));
mpool->closeConn( connfd);
+ n_recv_err++;
// mpool->conns[i].fd = -1;
} else {
// 浠ｇ悊鏈嶅姟娌℃湁杞彂鎴愬姛
- mpool->conns[i].fd = -1;
+
+ logger->error("NetModSocket::_sendandrecv_ read_response key = %d , %s", get_key(), bus_strerror(ret));
+ mpool->conns[i].fd = -1;
+ n_recv_err++;
}
n_resp++;
@@ -302,22 +301,22 @@
}
-int NetModSocket::pub(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size) {
+int NetModSocket::pub(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size) {
return _pub_(node_arr, arrlen, topic, topic_size, content, content_size, -1);
}
-int NetModSocket::pub_nowait(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size) {
+int NetModSocket::pub_nowait(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size) {
return _pub_(node_arr, arrlen, topic, topic_size, content, content_size, 0);
}
-int NetModSocket::pub_timeout(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int msec ) {
+int NetModSocket::pub_timeout(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size, int msec ) {
return _pub_(node_arr, arrlen, topic, topic_size, content, content_size, msec);
}
// int pub(char *topic, int topic_size, void *content, int content_size, int port);
-int NetModSocket::_pub_(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content,
+int NetModSocket::_pub_(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content,
int content_size, int msec) {
int i, connfd;
net_node_t *node;
@@ -331,20 +330,23 @@
int ret;
NetConnPool *mpool = _get_pool();
+ net_mod_recv_err_t err_msg;
+
// 鏈湴鍙戦��
if(node_arr == NULL || arrlen == 0) {
if(msec == 0) {
- ret = shmModSocket.pub_nowait(topic, topic_size, content, content_size, SHM_BUS_KEY);
+ ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY, NULL, BUS_NOWAIT_FLAG);
} else if(msec > 0) {
timeout.tv_sec = msec / 1000;
timeout.tv_nsec = (msec - timeout.tv_sec * 1000) * 10e6;
- ret = shmModSocket.pub_timeout(topic, topic_size, content, content_size, SHM_BUS_KEY, &timeout);
+ ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY, &timeout, BUS_TIMEOUT_FLAG);
} else {
ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY);
}
if(ret == 0 ) {
n_pub_suc++;
}
+ return n_pub_suc;
}
for (i = 0; i < arrlen; i++) {
@@ -353,11 +355,11 @@
if(node->host == NULL) {
// 鏈湴鍙戦��
if(msec == 0) {
- ret = shmModSocket.pub_nowait(topic, topic_size, content, content_size, SHM_BUS_KEY);
+ ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY, NULL, BUS_NOWAIT_FLAG);
} else if(msec > 0) {
timeout.tv_sec = msec / 1000;
timeout.tv_nsec = (msec - timeout.tv_sec * 1000) * 10e6;
- ret = shmModSocket.pub_timeout(topic, topic_size, content, content_size, SHM_BUS_KEY, &timeout);
+ ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY, &timeout, BUS_TIMEOUT_FLAG);
} else {
ret = shmModSocket.pub(topic, topic_size, content, content_size, SHM_BUS_KEY);
}
@@ -374,7 +376,7 @@
}
request_head.mod = BUS;
memcpy(request_head.host, node->host, sizeof(request_head.host));
- request_head.key = node->key;
+ request_head.key = SHM_BUS_KEY;
request_head.content_length = content_size;
request_head.topic_length = strlen(topic) + 1;
request_head.timeout = msec;
@@ -403,7 +405,7 @@
{
mpool->nready--;
// printf("POLLIN %d\n", connfd);
- if( (ret = read_response(connfd, &recv_msg)) == 0) {
+ if( (ret = read_response(connfd, &recv_msg, &err_msg)) == 0) {
// 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
mpool->conns[i].fd = -1;
@@ -456,55 +458,20 @@
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
int NetModSocket::sendto(const void *buf, const int size, const int key){
- int rv = shmModSocket.sendto(buf, size, key);
- if(rv == 0) {
- logger->debug("NetModSocket::sendto: %d sendto %d success.\n", get_key(), key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket::sendto: %d sendto %d failed %s", get_key(), key, bus_strerror(rv));
- } else {
- logger->error(rv, "NetModSocket::sendto : %d sendto %d failed", get_key(), key);
- }
- return rv;
+ return shmModSocket.sendto(buf, size, key);
}
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::sendto_timeout(const void *buf, const int size, const int key, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- int rv = shmModSocket.sendto_timeout(buf, size, key, &timeout);
- if(rv == 0) {
- logger->debug("NetModSocket::sendto_timeout: %d sendto %d success.\n", get_key(), key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket::sendto_timeout : %d sendto %d failed %s", get_key(), key, bus_strerror(rv));
- } else {
- logger->error(rv, "NetModSocket::sendto_timeout: %d sendto %d failed", get_key(), key);
- }
- return rv;
+ return shmModSocket.sendto(buf, size, key, &timeout, BUS_TIMEOUT_FLAG);
+
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
int NetModSocket::sendto_nowait(const void *buf, const int size, const int key){
- int rv = shmModSocket.sendto_nowait(buf, size, key);
- if(rv == 0) {
- logger->debug("NetModSocket::sendto_nowait: %d sendto %d success.\n", get_key(), key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket::sendto_nowait %d sendto %d failed %s", get_key(), key, bus_strerror(rv));
-
- } else {
- logger->error(rv, "NetModSocket::sendto_nowait %d sendto %d failed", get_key(), key);
- }
- return rv;
+ return shmModSocket.sendto(buf, size, key, NULL, BUS_NOWAIT_FLAG);
+
}
/**
@@ -513,54 +480,29 @@
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
int NetModSocket::recvfrom(void **buf, int *size, int *key) {
- int rv = shmModSocket.recvfrom(buf, size, key);
- if(rv == 0) {
- logger->debug("NetModSocket::recvfrom: %d recvfrom %d success.\n", get_key(), *key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- logger->debug("NetModSocket::recvfrom: socket %d recvfrom failed %s", get_key(), bus_strerror(rv));
- } else {
- logger->error(rv, "NetModSocket::recvfrom: socket %d recvfrom failed", get_key());
- }
- return rv;
+ return shmModSocket.recvfrom(buf, size, key);
+
}
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::recvfrom_timeout(void **buf, int *size, int *key, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- int rv = shmModSocket.recvfrom_timeout(buf, size, key, &timeout);
- if(rv == 0) {
- logger->debug("NetModSocket::recvfrom: %d recvfrom %d success.\n", get_key(), *key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket::recvfrom_timeout: %d recvfrom failed %s", get_key(), bus_strerror(rv));
- } else {
- logger->error(rv, "NetModSocket::recvfrom_timeout: %d recvfrom failed", get_key());
- }
- return rv;
+ return shmModSocket.recvfrom(buf, size, key, &timeout, BUS_TIMEOUT_FLAG);
+
}
int NetModSocket::recvfrom_nowait(void **buf, int *size, int *key){
- int rv = shmModSocket.recvfrom_nowait(buf, size, key);
- if(rv == 0) {
- logger->debug("NetModSocket::recvfrom: %d recvfrom %d success.\n", get_key(), *key);
- return 0;
- }
-
- if(rv > EBUS_BASE) {
- // bus_errno = EBUS_TIMEOUT;
- logger->debug("NetModSocket::recvfrom_nowait: %d recvfrom failed %s", get_key(), bus_strerror(rv));
- } else {
- logger->error(rv, "NetModSocket::recvfrom_nowait: %d recvfrom failed", get_key());
- }
- return rv;
+ return shmModSocket.recvfrom(buf, size, key, NULL, BUS_NOWAIT_FLAG);
}
+
+
+int NetModSocket::recvandsend(recvandsend_callback_fn callback,
+ const struct timespec *timeout , int flag, void * user_data ) {
+
+ return shmModSocket.recvandsend(callback, timeout, flag, user_data);
+}
+
/**
* 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
@@ -573,10 +515,10 @@
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::sendandrecv_timeout( const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- return shmModSocket.sendandrecv_timeout(send_buf, send_size, key, recv_buf, recv_size, &timeout);
+ return shmModSocket.sendandrecv(send_buf, send_size, key, recv_buf, recv_size, &timeout, BUS_TIMEOUT_FLAG);
}
int NetModSocket::sendandrecv_nowait( const void *send_buf, const int send_size, const int key, void **recv_buf, int *recv_size) {
- return shmModSocket.sendandrecv_nowait(send_buf, send_size, key, recv_buf, recv_size);
+ return shmModSocket.sendandrecv(send_buf, send_size, key, recv_buf, recv_size, NULL, BUS_NOWAIT_FLAG);
}
@@ -592,10 +534,10 @@
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::sub_timeout( void *topic, int size, int key, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- return shmModSocket.sub_timeout((char *)topic, size, key, &timeout);
+ return shmModSocket.sub((char *)topic, size, key, &timeout, BUS_TIMEOUT_FLAG);
}
int NetModSocket::sub_nowait( void *topic, int size, int key){
- return shmModSocket.sub_nowait((char *)topic, size, key);
+ return shmModSocket.sub((char *)topic, size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -612,10 +554,10 @@
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::desub_timeout( void *topic, int size, int key, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- return shmModSocket.desub_timeout((char *)topic, size, key, &timeout);
+ return shmModSocket.desub((char *)topic, size, key, &timeout, BUS_TIMEOUT_FLAG);
}
int NetModSocket::desub_nowait( void *topic, int size, int key){
- return shmModSocket.desub_nowait((char *)topic, size, key);
+ return shmModSocket.desub((char *)topic, size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -632,10 +574,10 @@
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int NetModSocket::pub_timeout( char *topic, int topic_size, void *content, int content_size, int key, int sec, int nsec){
struct timespec timeout = {sec, nsec};
- return shmModSocket.pub_timeout(topic, topic_size, content, content_size, key, &timeout);
+ return shmModSocket.pub(topic, topic_size, content, content_size, key, &timeout, BUS_TIMEOUT_FLAG);
}
int NetModSocket::pub_nowait( char *topic, int topic_size, void *content, int content_size, int key){
- return shmModSocket.pub_nowait(topic, topic_size, content, content_size, key);
+ return shmModSocket.pub(topic, topic_size, content, content_size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -653,7 +595,7 @@
//======================================================================================
int NetModSocket::write_request(int clientfd, net_mod_request_head_t &request_head,
- void *content_buf, int content_size, void *topic_buf, int topic_size) {
+ const void *content_buf, int content_size, const void *topic_buf, int topic_size) {
int buf_size;
char *buf;
@@ -694,7 +636,7 @@
* @return 0 鎴愬姛, EBUS_NET 缃戠粶閿欒锛� 鍏朵粬鍊� 浠ｇ悊鏈嶅姟娌℃湁杞彂鎴愬姛銆�
*
*/
-int NetModSocket::read_response(int connfd, net_mod_recv_msg_t *recv_msg) {
+int NetModSocket::read_response(int connfd, net_mod_recv_msg_t *recv_msg, net_mod_recv_err_t *err_arr) {
int recv_size;
void *recv_buf;
char response_head_bs[NET_MODE_RESPONSE_HEAD_LENGTH];
@@ -702,14 +644,21 @@
net_mod_response_head_t response_head;
if ( rio_readn(connfd, response_head_bs, NET_MODE_RESPONSE_HEAD_LENGTH) != NET_MODE_RESPONSE_HEAD_LENGTH) {
LoggerFactory::getLogger()->error(errno, "NetModSocket::read_response rio_readnb response_head");
-
- return -1;
+ memcpy(err_arr->host, "unkown", sizeof(err_arr->host));
+ err_arr->port = 0;
+ err_arr->key = 0;
+ err_arr->code = EBUS_NET;
+ return EBUS_NET;
}
response_head = NetModSocket::decode_response_head(response_head_bs);
// printf(">>>> read_response %s\n", response_head.host);
if(response_head.code != 0) {
// 浠ｇ悊鏈嶅姟娌¤兘鎴愬姛鍙戦�佺粰瀵瑰簲鐨刱ey
+ memcpy(err_arr->host, response_head.host, sizeof(err_arr->host));
+ err_arr->port = response_head.port;
+ err_arr->key = response_head.key;
+ err_arr->code = response_head.code;
return response_head.code;
}
@@ -719,6 +668,11 @@
exit(1);
}
if ( (recv_size = rio_readn(connfd, recv_buf, response_head.content_length) ) != response_head.content_length) {
+
+ memcpy(err_arr->host, response_head.host, sizeof(err_arr->host));
+ err_arr->port = response_head.port;
+ err_arr->key = response_head.key;
+ err_arr->code = EBUS_NET;
LoggerFactory::getLogger()->error(errno, "NetModSocket::read_response rio_readnb recv_buf");
//缃戠粶閿欒
return EBUS_NET;
--
Gitblit v1.8.0