From 970c212a22d1f1f33780eb58f606008fd6e01e3c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 30 十一月 2020 18:38:07 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.c | 249 ++++++++++++++++++++++++++++++-------------------
1 files changed, 153 insertions(+), 96 deletions(-)
diff --git a/src/socket/net_mod_socket.c b/src/socket/net_mod_socket.c
index 7b9b577..5e0b0b1 100644
--- a/src/socket/net_mod_socket.c
+++ b/src/socket/net_mod_socket.c
@@ -39,8 +39,8 @@
_sendandrecv_(node_arr, arrlen, send_buf,send_size, recv_arr, recv_arr_size, -1);
}
int NetModSocket::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) {
- _sendandrecv_(node_arr, arrlen, send_buf,send_size, recv_arr, recv_arr_size, timeout);
+ net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int msec) {
+ _sendandrecv_(node_arr, arrlen, send_buf,send_size, recv_arr, recv_arr_size, msec);
}
int NetModSocket::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) {
@@ -63,6 +63,7 @@
// printf("open after: %s\n", mapKey);
if(connfd < 0) {
LoggerFactory::getLogger()->error(errno, "NetModSocket::connect %s:%d ", node->host, node->port);
+ exit(1);
return -1;
}
@@ -104,12 +105,12 @@
}
}
- LoggerFactory::getLogger()->debug( "closed %d\n", connfd);
+ // LoggerFactory::getLogger()->debug( "NetModSocket::close_connect %d\n", connfd);
}
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 timeout = 5 * 1000) {
+ net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int msec ) {
int i, n, recv_size, connfd;
net_node_t *node;
@@ -119,7 +120,7 @@
net_mod_request_head_t request_head = {};
- int n_req = 0, n_recv_suc = 0, n_resp;
+ int n_req = 0, n_recv_suc = 0, n_resp =0;
net_mod_recv_msg_t *ret_arr = (net_mod_recv_msg_t *)calloc(arrlen, sizeof(net_mod_recv_msg_t));
@@ -151,13 +152,12 @@
request_head.port = node->port;
request_head.key = node->key;
request_head.content_length = send_size;
-
+ request_head.timeout = msec;
// printf("write_request %s:%d\n", request_head.host, request_head.port);
- if(write_request(connfd, request_head, send_buf, send_size) != 0) {
+ 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);
close_connect(mpool, connfd);
- // mpool.conns[i].fd = -1;
} else {
n_req++;
}
@@ -167,12 +167,10 @@
// printf(" mpool.maxi = %d\n", mpool.maxi);
// printf(" n_req = %d\n", n_req);
-// int tmp = 0;
while(n_resp < n_req)
{
-// printf(" while %d\n", tmp++);
/* Wait for listening/connected descriptor(s) to become ready */
- if( (mpool.nready = poll(mpool.conns, mpool.maxi + 1, timeout) ) <= 0) {
+ if( (mpool.nready = poll(mpool.conns, mpool.maxi + 1, msec) ) <= 0) {
// wirite_set 鍜� read_set 鍦ㄦ寚瀹氭椂闂村唴閮芥病鍑嗗濂�
break;
}
@@ -185,18 +183,17 @@
mpool.nready--;
// printf("POLLIN %d\n", connfd);
if( (n = read_response(connfd, ret_arr+n_recv_suc)) == 0) {
-
- // 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
- mpool.conns[i].fd = -1;
n_recv_suc++;
- } else if(n == -1) {
- mpool.conns[i].fd = -1;
- close_connect(mpool, connfd);
- } else {
- mpool.conns[i].fd = -1;
-
}
+ // else if(n == -1) {
+ // // 缃戠粶閿欒
+ // } else {
+ // // 瀵规柟key鏄叧闂殑
+ // }
+
+ mpool.conns[i].fd = -1;
+ close_connect(mpool, connfd);
n_resp++;
// printf("read response %d\n", n);
@@ -217,6 +214,7 @@
}
}
+ //瓒呮椂鍚庯紝鍏抽棴瓒呮椂杩炴帴
for (i = 0; i <= mpool.maxi; i++) {
if ( (connfd = mpool.conns[i].fd) > 0 ) {
// 鍏抽棴骞舵竻闄ゅ啓鍏ユ垨璇诲彇澶辫触鐨勮繛鎺�
@@ -233,6 +231,128 @@
}
return n_recv_suc;
+}
+
+int NetModSocket::pub(net_node_t *node_arr, int arrlen, char *topic, int topic_size, 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) {
+ 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 ) {
+ 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 content_size, int timeout) {
+ int i, connfd;
+ net_node_t *node;
+
+ net_mod_request_head_t request_head;
+ net_mod_recv_msg_t recv_msg;
+ char portstr[32];
+ int n_req = 0, n_pub_suc = 0, n_resp = 0;
+ int ret;
+
+ pool mpool;
+ init_conn_pool(mpool);
+
+
+ for (i = 0; i < arrlen; i++) {
+
+ node = &node_arr[i];
+ if(node->host == NULL) {
+ // 鏈湴鍙戦��
+ if(shmModSocket.pub(topic, topic_size, content, content_size, node->key) == 0 ) {
+ n_pub_suc++;
+ }
+
+ } else {
+ sprintf(portstr, "%d", node->port);
+ if( (connfd = connect(mpool, node)) < 0 ) {
+ continue;
+ }
+ request_head.mod = BUS;
+ request_head.key = node->key;
+ request_head.content_length = content_size;
+ request_head.topic_length = strlen(topic) + 1;
+ request_head.timeout = timeout;
+
+ if(write_request(connfd, request_head, content, content_size, topic, request_head.topic_length) != 0) {
+ LoggerFactory::getLogger()->error(" NetModSocket::_pub_ write_request failture %s:%d\n", node->host, node->port);
+ close_connect(mpool, connfd);
+ } else {
+ n_req++;
+ }
+
+ }
+ }
+
+ while(n_resp < n_req)
+ {
+ /* Wait for listening/connected descriptor(s) to become ready */
+ if( (mpool.nready = poll(mpool.conns, mpool.maxi + 1, timeout) ) <= 0) {
+ // wirite_set 鍜� read_set 鍦ㄦ寚瀹氭椂闂村唴閮芥病鍑嗗濂�
+ break;
+ }
+// printf("mpool.nready =%d\n", mpool.nready);
+ for (i = 0; (i <= mpool.maxi) && (mpool.nready > 0); i++) {
+ if ( (connfd = mpool.conns[i].fd) > 0 ) {
+ if (mpool.conns[i].revents & POLLIN )
+ {
+ mpool.nready--;
+// printf("POLLIN %d\n", connfd);
+ if( (ret = read_response(connfd, &recv_msg)) == 0) {
+
+ // 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
+ mpool.conns[i].fd = -1;
+ n_pub_suc++;
+ }
+ // else if(ret == -1) {
+ // // 缃戠粶杩炴帴閿欒
+ // } else {
+ // // 瀵规柟鐨刱ey鏄叧闂殑
+ // }
+ mpool.conns[i].fd = -1;
+ close_connect(mpool, connfd);
+ n_resp++;
+// printf("read response %d\n", n);
+
+ }
+
+ if (mpool.conns[i].revents & POLLOUT ) {
+ // printf("poll POLLOUT %d\n", connfd);
+ }
+
+ if (mpool.conns[i].revents & (POLLRDHUP | POLLHUP | POLLERR) )
+ {
+// printf("poll POLLERR %d\n", connfd);
+ mpool.nready--;
+
+ mpool.conns[i].fd = -1;
+ close_connect(mpool, connfd);
+ }
+ }
+ }
+ }
+
+ //瓒呮椂鍚庯紝鍏抽棴瓒呮椂杩炴帴
+ for (i = 0; i <= mpool.maxi; i++) {
+ if ( (connfd = mpool.conns[i].fd) > 0 ) {
+ // 鍏抽棴骞舵竻闄ゅ啓鍏ユ垨璇诲彇澶辫触鐨勮繛鎺�
+ close_connect(mpool, connfd);
+ mpool.conns[i].fd = -1;
+ }
+ }
+
+ mpool.maxi = -1;
+
+ return n_pub_suc;
}
@@ -356,76 +476,6 @@
}
-// 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 content_size) {
- int i, clientfd;
- net_node_t *node;
-
- char *buf;
- int max_buf_size, buf_size;
-
- net_mod_request_head_t request_head;
- char portstr[32];
- int nsuc = 0;
-
- if((buf = (char *)malloc(MAXBUF)) == NULL) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::sendandrecv malloc");
- exit(1);
- } else {
- max_buf_size = MAXBUF;
- }
-
- for (i = 0; i< arrlen; i++) {
-
- node = &node_arr[i];
- if(node->host == NULL) {
- // 鏈湴鍙戦��
- if(shmModSocket.pub(topic, topic_size, content, content_size, node->key) == 0 ) {
- nsuc++;
- }
-
- } else {
- sprintf(portstr, "%d", node->port);
- clientfd = open_clientfd(node->host, portstr);
- if(clientfd < 0) {
- continue;
- }
-
- request_head.mod = BUS;
- request_head.key = node->key;
- request_head.content_length = content_size;
- request_head.topic_length = strlen(topic) + 1;
-
- buf_size = NET_MODE_REQUEST_HEAD_LENGTH + content_size + request_head.topic_length;
-
- if(max_buf_size < buf_size) {
- if( ( buf = (char *)realloc(buf, buf_size)) == NULL) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::pub realloc buf ");
- } else {
- max_buf_size = buf_size;
- }
-
- }
-
- memcpy(buf, NetModSocket::encode_request_head(request_head), NET_MODE_REQUEST_HEAD_LENGTH);
- memcpy(buf + NET_MODE_REQUEST_HEAD_LENGTH, content, content_size);
- memcpy(buf + NET_MODE_REQUEST_HEAD_LENGTH + content_size, topic, request_head.topic_length);
-
- if(rio_writen(clientfd, buf, buf_size) != buf_size ) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::pub rio_writen conent ");
- } else {
- nsuc++;
- }
- close(clientfd);
- }
-
-
- }
-
- free(buf);
- return nsuc;
-}
/**
@@ -573,9 +623,8 @@
//======================================================================================
-
-
-int NetModSocket::write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size) {
+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) {
int buf_size;
char *buf;
@@ -587,7 +636,7 @@
max_buf_size = MAXBUF;
}
- buf_size = send_size + NET_MODE_REQUEST_HEAD_LENGTH;
+ buf_size = NET_MODE_REQUEST_HEAD_LENGTH + content_size + topic_size ;
if(max_buf_size < buf_size) {
if((buf = (char *)realloc(buf, buf_size)) == NULL) {
@@ -599,7 +648,9 @@
}
memcpy(buf, NetModSocket::encode_request_head(request_head), NET_MODE_REQUEST_HEAD_LENGTH);
- memcpy(buf + NET_MODE_REQUEST_HEAD_LENGTH, send_buf, send_size);
+ memcpy(buf + NET_MODE_REQUEST_HEAD_LENGTH, content_buf, content_size);
+ if(topic_size != 0 )
+ memcpy(buf + NET_MODE_REQUEST_HEAD_LENGTH + content_size, topic_buf, topic_size);
if(rio_writen(clientfd, buf, buf_size) != buf_size ) {
LoggerFactory::getLogger()->error(errno, "NetModSocket::write_request rio_writen");
@@ -629,7 +680,7 @@
response_head = NetModSocket::decode_response_head(response_head_bs);
// printf(">>>> read_response %s\n", response_head.host);
if(response_head.code != 0) {
- // 瀵规柟娌℃湁瀵瑰簲鐨刱ey
+ // 浠ｇ悊鏈嶅姟娌¤兘鎴愬姛鍙戦�佺粰瀵瑰簲鐨刱ey
return 1;
}
@@ -696,6 +747,9 @@
tmp_ptr += 4;
PUT(tmp_ptr, htonl(head.topic_length));
+
+ tmp_ptr += 4;
+ PUT_INT32(tmp_ptr, htonl(head.timeout));
return headbs;
@@ -722,6 +776,9 @@
tmp_ptr += 4;
head.topic_length = ntohl(GET(tmp_ptr));
+
+ tmp_ptr += 4;
+ head.timeout = ntohl(GET_INT32(tmp_ptr));
return head;
}
--
Gitblit v1.8.0