From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 19:21:55 +0800
Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况
---
src/socket/net_mod_socket.c | 316 +++++++++++++++++++++++++++-------------------------
1 files changed, 166 insertions(+), 150 deletions(-)
diff --git a/src/socket/net_mod_socket.c b/src/socket/net_mod_socket.c
index 5e0b0b1..48b0e7c 100644
--- a/src/socket/net_mod_socket.c
+++ b/src/socket/net_mod_socket.c
@@ -1,15 +1,22 @@
#include "net_mod_socket.h"
#include "socket_io.h"
#include "net_mod_socket_io.h"
+#include "net_conn_pool.h"
#include <sys/types.h> /* See NOTES */
#include <sys/socket.h>
+#include <pthread.h>
+static Logger *logger = LoggerFactory::getLogger();
+
+static pthread_once_t once = PTHREAD_ONCE_INIT;
+static pthread_key_t poolKey;
NetModSocket::NetModSocket()
{
- if (Signal(SIGPIPE, SIG_IGN) == SIG_ERR) err_msg(errno, "signal");
+ if (Signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+ logger->error(errno, "NetModSocket::NetModSocket signal");
}
@@ -49,64 +56,28 @@
}
+/* Free thread-specific data buffer */
+void NetModSocket::_destroyConnPool_(void *_pool)
+{
-int NetModSocket::connect( pool &mpool, net_node_t *node) {
-
- int connfd;
- int i;
- char portstr[32];
-
- // printf("mis: %s\n", mapKey);
- sprintf(portstr, "%d", node->port);
-// printf("open before: %s\n", mapKey);
- connfd = open_clientfd(node->host, portstr);
-// 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;
- }
-
- for (i = 0; i < OPEN_MAX; i++) { /* Find an available slot */
- if (mpool.conns[i].fd < 0)
- {
- /* Add connected descriptor to the mpool */
- mpool.conns[i].fd = connfd;
-
- mpool.conns[i].events = POLLIN;
- /* Add the descriptor to descriptor set */
- break;
- }
- }
-
- if (i > mpool.maxi)
- mpool.maxi = i;
-
- if (i == OPEN_MAX) {
- /* Couldn't find an empty slot */
- LoggerFactory::getLogger()->error(errno, "add_client error: Too many clients");
- return -1;
- }
-
- return connfd;
+ NetConnPool *mpool = (NetConnPool *)_pool;
+ delete mpool;
+ logger->debug("destory connPool");
}
+ /* One-time key creation function */
+void NetModSocket::_createConnPoolKey_(void)
+{
+ int ret;
-void NetModSocket::close_connect(pool &mpool, int connfd) {
- int i;
- if(close(connfd) != 0) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::close_connect close");
+ /* Allocate a unique thread-specific data key and save the address
+ of the destructor for thread-specific data buffers */
+
+ ret = pthread_key_create(&poolKey, _destroyConnPool_);
+ if (ret != 0) {
+ logger->error(ret, "pthread_key_create");
+ exit(1);
}
-
-
- for (i = 0; i <= mpool.maxi; i++) {
- if(mpool.conns[i].fd == connfd) {
- mpool.conns[i].fd = -1;
- }
- }
-
- // 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,
@@ -114,9 +85,7 @@
int i, n, recv_size, connfd;
net_node_t *node;
- void *recv_buf;
-
- pool mpool;
+ void *recv_buf = NULL;
net_mod_request_head_t request_head = {};
@@ -124,25 +93,57 @@
net_mod_recv_msg_t *ret_arr = (net_mod_recv_msg_t *)calloc(arrlen, sizeof(net_mod_recv_msg_t));
+
+ int ret;
+ NetConnPool *mpool;
+
+ /* Make first caller allocate key for thread-specific data */
+ ret = pthread_once(&once, _createConnPoolKey_);
+ if (ret != 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ pthread_once");
+ exit(1);
+ }
+
+ mpool = (NetConnPool *)pthread_getspecific(poolKey);
+ if (mpool == NULL)
+ {
+ /* If first call from this thread, allocate buffer for thread, and save its location */
+ logger->debug("Create connPool");
+ mpool = new NetConnPool();
+ if (mpool == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ malloc");
+ exit(1);
+ }
+
+
+
+ ret = pthread_setspecific(poolKey, mpool);
+ if (ret != 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ pthread_setspecific");
+ exit(1);
+ }
+ }
- init_conn_pool(mpool);
+
for (i = 0; i< arrlen; i++) {
node = &node_arr[i];
- if(node->host == NULL) {
+ if(node->host == NULL || strcmp(node->host, "") == 0 ) {
// 鏈湴鍙戦��
- shmModSocket.sendandrecv(send_buf, send_size, node->key, &recv_buf, &recv_size);
- strcpy( ret_arr[n_recv_suc].host,"localshm");
- ret_arr[n_recv_suc].port = 0;
- ret_arr[n_recv_suc].key = node->key;
- ret_arr[n_recv_suc].content = recv_buf;
- ret_arr[n_recv_suc].content_length = recv_size;
- n_recv_suc++;
+ if(shmModSocket.sendandrecv(send_buf, send_size, node->key, &recv_buf, &recv_size) == 0) {
+ strcpy( ret_arr[n_recv_suc].host,"");
+ ret_arr[n_recv_suc].port = 0;
+ ret_arr[n_recv_suc].key = node->key;
+ ret_arr[n_recv_suc].content = recv_buf;
+ ret_arr[n_recv_suc].content_length = recv_size;
+ n_recv_suc++;
+ }
+
continue;
}
- if( (connfd = connect(mpool, node)) < 0 ) {
+ if( (connfd = mpool->getConn(node->host, node->port)) < 0 ) {
continue;
}
@@ -157,73 +158,76 @@
// 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);
- close_connect(mpool, connfd);
+ mpool->closeConn( connfd);
} else {
n_req++;
}
}
-// printf(" mpool.maxi = %d\n", mpool.maxi);
+// printf(" mpool->maxi = %d\n", mpool->maxi);
// printf(" n_req = %d\n", 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, msec) ) <= 0) {
+ if( (mpool->nready = poll(mpool->conns, mpool->maxi + 1, msec) ) <= 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 ) {
+// 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 the descriptor is ready, echo a text line from it */
- if (mpool.conns[i].revents & POLLIN )
+ if (mpool->conns[i].revents & POLLIN )
{
- mpool.nready--;
+ mpool->nready--;
// printf("POLLIN %d\n", connfd);
if( (n = read_response(connfd, ret_arr+n_recv_suc)) == 0) {
n_recv_suc++;
+ // 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
+ mpool->conns[i].fd = -1;
}
- // else if(n == -1) {
- // // 缃戠粶閿欒
- // } else {
- // // 瀵规柟key鏄叧闂殑
- // }
+ else if(n == -1) {
+ // 缃戠粶閿欒
+ mpool->closeConn( connfd);
+ // mpool->conns[i].fd = -1;
+ } else {
+ // 瀵规柟key鏄叧闂殑
+ mpool->conns[i].fd = -1;
+ }
- mpool.conns[i].fd = -1;
- close_connect(mpool, connfd);
n_resp++;
// printf("read response %d\n", n);
}
- if (mpool.conns[i].revents & POLLOUT ) {
+ if (mpool->conns[i].revents & POLLOUT ) {
// printf("poll POLLOUT %d\n", connfd);
}
- if (mpool.conns[i].revents & (POLLRDHUP | POLLHUP | POLLERR) )
+ if (mpool->conns[i].revents & (POLLRDHUP | POLLHUP | POLLERR) )
{
// printf("poll POLLERR %d\n", connfd);
- mpool.nready--;
- close_connect(mpool, connfd);
- mpool.conns[i].fd = -1;
+ mpool->nready--;
+ mpool->closeConn( connfd);
+ // mpool->conns[i].fd = -1;
}
}
}
}
//瓒呮椂鍚庯紝鍏抽棴瓒呮椂杩炴帴
- for (i = 0; i <= mpool.maxi; i++) {
- if ( (connfd = mpool.conns[i].fd) > 0 ) {
+ for (i = 0; i <= mpool->maxi; i++) {
+ if ( (connfd = mpool->conns[i].fd) > 0 ) {
// 鍏抽棴骞舵竻闄ゅ啓鍏ユ垨璇诲彇澶辫触鐨勮繛鎺�
- close_connect(mpool, connfd);
- mpool.conns[i].fd = -1;
+ mpool->closeConn( connfd);
+ // mpool->conns[i].fd = -1;
}
}
- mpool.maxi = -1;
+ mpool->maxi = -1;
*recv_arr = ret_arr;
if(recv_arr_size != NULL) {
@@ -232,6 +236,17 @@
return n_recv_suc;
}
+
+
+void NetModSocket::free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size) {
+
+ for(int i =0; i< size; i++) {
+ if(arr[i].content != NULL)
+ free(arr[i].content);
+ }
+ free(arr);
+}
+
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);
@@ -257,12 +272,41 @@
net_mod_recv_msg_t recv_msg;
char portstr[32];
int n_req = 0, n_pub_suc = 0, n_resp = 0;
+
int ret;
+ NetConnPool *mpool;
- pool mpool;
- init_conn_pool(mpool);
+ /* Make first caller allocate key for thread-specific data */
+ ret = pthread_once(&once, _createConnPoolKey_);
+ if (ret != 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ pthread_once");
+ exit(1);
+ }
-
+ mpool = (NetConnPool *)pthread_getspecific(poolKey);
+ if (mpool == NULL)
+ {
+ /* If first call from this thread, allocte buffer for thread, and save its location */
+ mpool = new NetConnPool();
+ if (mpool == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ malloc");
+ exit(1);
+ }
+
+ ret = pthread_setspecific(poolKey, mpool);
+ if (ret != 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::_sendandrecv_ pthread_setspecific");
+ exit(1);
+ }
+ }
+
+ // 鏈湴鍙戦��
+ if(node_arr == NULL || arrlen == 0) {
+ if(shmModSocket.pub(topic, topic_size, content, content_size, node->key) == 0 ) {
+ n_pub_suc++;
+ }
+ }
+
for (i = 0; i < arrlen; i++) {
node = &node_arr[i];
@@ -274,10 +318,11 @@
} else {
sprintf(portstr, "%d", node->port);
- if( (connfd = connect(mpool, node)) < 0 ) {
+ if( (connfd = mpool->getConn(node->host, node->port)) < 0 ) {
continue;
}
request_head.mod = BUS;
+ memcpy(request_head.host, node->host, sizeof(request_head.host));
request_head.key = node->key;
request_head.content_length = content_size;
request_head.topic_length = strlen(topic) + 1;
@@ -285,7 +330,7 @@
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);
+ mpool->closeConn( connfd);
} else {
n_req++;
}
@@ -296,61 +341,60 @@
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) {
+ 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 )
+// 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--;
+ mpool->nready--;
// printf("POLLIN %d\n", connfd);
if( (ret = read_response(connfd, &recv_msg)) == 0) {
// 鎴愬姛鏀跺埌杩斿洖娑堟伅锛屾竻绌鸿鍏ヤ綅
- mpool.conns[i].fd = -1;
+ mpool->conns[i].fd = -1;
n_pub_suc++;
}
- // else if(ret == -1) {
- // // 缃戠粶杩炴帴閿欒
- // } else {
- // // 瀵规柟鐨刱ey鏄叧闂殑
- // }
- mpool.conns[i].fd = -1;
- close_connect(mpool, connfd);
+ else if(ret == -1) {
+ // 缃戠粶杩炴帴閿欒
+ mpool->closeConn( connfd);
+ } else {
+ // 瀵规柟鐨刱ey鏄叧闂殑
+ mpool->conns[i].fd = -1;
+ }
n_resp++;
// printf("read response %d\n", n);
-
}
- if (mpool.conns[i].revents & POLLOUT ) {
+ if (mpool->conns[i].revents & POLLOUT ) {
// printf("poll POLLOUT %d\n", connfd);
}
- if (mpool.conns[i].revents & (POLLRDHUP | POLLHUP | POLLERR) )
+ if (mpool->conns[i].revents & (POLLRDHUP | POLLHUP | POLLERR) )
{
// printf("poll POLLERR %d\n", connfd);
- mpool.nready--;
+ mpool->nready--;
- mpool.conns[i].fd = -1;
- close_connect(mpool, connfd);
+ mpool->conns[i].fd = -1;
+ mpool->closeConn( connfd);
}
}
}
}
//瓒呮椂鍚庯紝鍏抽棴瓒呮椂杩炴帴
- for (i = 0; i <= mpool.maxi; i++) {
- if ( (connfd = mpool.conns[i].fd) > 0 ) {
+ for (i = 0; i <= mpool->maxi; i++) {
+ if ( (connfd = mpool->conns[i].fd) > 0 ) {
// 鍏抽棴骞舵竻闄ゅ啓鍏ユ垨璇诲彇澶辫触鐨勮繛鎺�
- close_connect(mpool, connfd);
- mpool.conns[i].fd = -1;
+ mpool->closeConn( connfd);
+ // mpool->conns[i].fd = -1;
}
}
- mpool.maxi = -1;
+ mpool->maxi = -1;
return n_pub_suc;
}
@@ -535,15 +579,6 @@
/**
- * 鍚姩bus
- *
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int NetModSocket::start_bus() {
- return shmModSocket.start_bus();
-}
-
-/**
* 璁㈤槄鎸囧畾涓婚
* @topic 涓婚
* @size 涓婚闀垮害
@@ -609,14 +644,6 @@
return shmModSocket.get_key();
}
-
-void NetModSocket::free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size) {
-
- for(int i =0; i< size; i++) {
- free(arr[i].content);
- }
- free(arr);
-}
@@ -706,17 +733,6 @@
-void NetModSocket::init_conn_pool(pool& mpool)
-{
- /* Initially, there are no connected descriptors */
- int i;
- mpool.maxi = -1; //line:conc:echoservers:beginempty
- for (i = 0; i < OPEN_MAX; i++) {
- mpool.conns[i].fd = -1;
- mpool.conns[i].events = 0;
- }
-
-}
/**
uint32_t mod;
--
Gitblit v1.8.0