From 9b9dd8cc7d3a6fd05750d4f41720cf6094780551 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 26 十一月 2020 16:46:14 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.c | 502 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 337 insertions(+), 165 deletions(-)
diff --git a/src/socket/net_mod_socket.c b/src/socket/net_mod_socket.c
index 9058272..f55e439 100644
--- a/src/socket/net_mod_socket.c
+++ b/src/socket/net_mod_socket.c
@@ -24,105 +24,43 @@
}
-void NetModSocket::init_req_rep_req_resp_pool()
-{
- /* Initially, there are no connected descriptors */
- int i;
- req_resp_pool.maxi = -1; //line:conc:echoservers:beginempty
- for (i = 0; i < OPEN_MAX; i++) {
- req_resp_pool.conns[i].fd = -1;
- req_resp_pool.conns[i].events = 0;
- }
-
+/**
+ * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int NetModSocket::bind(int port) {
+ return shmModSocket.bind(port);
}
-int NetModSocket::connect( net_node_t *node) {
- std::map<std::string, int>::iterator mapIter;
- int connfd;
- int i;
- char mapKey[256];
- char portstr[32];
-
- sprintf(mapKey, "%s:%d", node->host, node->port);
- mapIter = req_resp_pool.connectionMap.find(mapKey);
- if( mapIter != req_resp_pool.connectionMap.end()) {
- connfd = mapIter->second;
-// printf("hit: %s\n", mapKey);
- } else {
-// 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, "connect %s:%d ", node->host, node->port);
- return -1;
- }
- req_resp_pool.connectionMap.insert({mapKey, connfd});
- }
-
-
- for (i = 0; i < OPEN_MAX; i++) { /* Find an available slot */
- if (req_resp_pool.conns[i].fd < 0)
- {
- /* Add connected descriptor to the req_resp_pool */
- req_resp_pool.conns[i].fd = connfd;
-
- req_resp_pool.conns[i].events = POLLIN;
- /* Add the descriptor to descriptor set */
- break;
- }
- }
-
- if (i > req_resp_pool.maxi)
- req_resp_pool.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;
+/**
+ * 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int NetModSocket::force_bind( int port) {
+ return shmModSocket.force_bind(port);
}
-
-void NetModSocket::close_connect(int connfd) {
- int i;
- char mapKey[256];
- std::map<std::string, int>::iterator map_iter;
- if(close(connfd) != 0) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::close_connect close");
- }
-
-
- for (i = 0; i <= req_resp_pool.maxi; i++) {
- if(req_resp_pool.conns[i].fd == connfd) {
- req_resp_pool.conns[i].fd = -1;
- }
- }
-
- for ( map_iter = req_resp_pool.connectionMap.begin(); map_iter != req_resp_pool.connectionMap.end(); ) {
- if(connfd == map_iter->second) {
-// std::cout << "map_iter->first==" << map_iter->first << std::endl;
- map_iter = req_resp_pool.connectionMap.erase(map_iter);
- } else {
- ++map_iter;
- }
- }
-
- LoggerFactory::getLogger()->debug( "closed %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) {
+ _sendandrecv_(node_arr, arrlen, send_buf,send_size, recv_arr, recv_arr_size, -1);
+}
+int NetModSocket::sendandrecv_timout(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);
+}
+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) {
+ _sendandrecv_(node_arr, arrlen, send_buf,send_size, recv_arr, recv_arr_size, 0);
+
+}
+
+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) {
int i, n, recv_size, connfd;
net_node_t *node;
void *recv_buf;
- int timeout = 5 * 1000;
+
net_mod_request_head_t request_head = {};
int n_req = 0, n_recv_suc = 0, n_resp;
@@ -240,82 +178,6 @@
}
-int NetModSocket::write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size) {
-
- int buf_size;
- char *buf;
- int max_buf_size;
- if((buf = (char *)malloc(MAXBUF)) == NULL) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::NetModSocket malloc");
- exit(1);
- } else {
- max_buf_size = MAXBUF;
- }
-
- buf_size = send_size + NET_MODE_REQUEST_HEAD_LENGTH;
- if(max_buf_size < buf_size) {
-
- if((buf = (char *)realloc(buf, buf_size)) == NULL) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::write_request realloc buf");
- exit(1);
- } 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, send_buf, send_size);
-
- if(rio_writen(clientfd, buf, buf_size) != buf_size ) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::write_request rio_writen");
- free(buf);
- return -1;
- }
- free(buf);
- return 0;
-}
-
-/**
- * @return 0 鎴愬姛, 1 瀵规柟娌℃湁瀵瑰簲鐨刱ey, -1 缃戠粶閿欒
- *
- */
-int NetModSocket::read_response(int connfd, net_mod_recv_msg_t *recv_msg) {
- int recv_size;
- void *recv_buf;
- char response_head_bs[NET_MODE_RESPONSE_HEAD_LENGTH];
-
- 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;
- }
-
- response_head = NetModSocket::decode_response_head(response_head_bs);
-// printf(">>>> read_response %s\n", response_head.host);
- if(response_head.code != 0) {
- // 瀵规柟娌℃湁瀵瑰簲鐨刱ey
- return 1;
- }
-
- recv_buf = malloc(response_head.content_length);
- if(recv_buf == NULL) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::send malloc recv_buf");
- exit(1);
- }
- if ( (recv_size = rio_readn(connfd, recv_buf, response_head.content_length) ) != response_head.content_length) {
- LoggerFactory::getLogger()->error(errno, "NetModSocket::read_response rio_readnb recv_buf");
-
- return -1;
- }
-
- strcpy( recv_msg->host, response_head.host);
- recv_msg->port = response_head.port;
- recv_msg->key = response_head.key;
- recv_msg->content = recv_buf;
- recv_msg->content_length = recv_size;
- return 0;
-}
int NetModSocket::sendandrecv_safe(net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) {
@@ -508,6 +370,139 @@
return nsuc;
}
+
+/**
+ * 鍙戦�佷俊鎭�
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+ */
+int NetModSocket::sendto(const void *buf, const int size, const int port){
+ return shmModSocket.sendto(buf, size,port);
+}
+
+// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::sendto_timeout(const void *buf, const int size, const int port, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.sendto_timeout(buf, size, port, &timeout);
+}
+
+// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
+int NetModSocket::sendto_nowait(const void *buf, const int size, const int port){
+ return shmModSocket.sendto_nowait(buf, size,port);
+}
+
+/**
+ * 鎺ユ敹淇℃伅
+ * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int NetModSocket::recvfrom(void **buf, int *size, int *port) {
+ return shmModSocket.recvfrom(buf, size, port);
+}
+// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::recvfrom_timeout(void **buf, int *size, int *port, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.recvfrom_timeout(buf, size, port, &timeout);
+}
+
+int NetModSocket::recvfrom_nowait(void **buf, int *size, int *port){
+ return shmModSocket.recvfrom_nowait(buf, size, port);
+}
+
+/**
+ * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
+ * @port 鍙戦�佺粰璋�
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int NetModSocket::sendandrecv( const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size){
+ return shmModSocket.sendandrecv(send_buf, send_size, port, recv_buf, recv_size);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::sendandrecv_timeout( const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.sendandrecv_timeout(send_buf, send_size, port, recv_buf, recv_size, &timeout);
+}
+int NetModSocket::sendandrecv_nowait( const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) {
+ return shmModSocket.sendandrecv_nowait(send_buf, send_size, port, recv_buf, recv_size);
+}
+
+
+/**
+ * 鍚姩bus
+ *
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int NetModSocket::start_bus() {
+ return shmModSocket.start_bus();
+}
+
+/**
+ * 璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚
+ * @size 涓婚闀垮害
+ * @port 鎬荤嚎绔彛
+ */
+int NetModSocket::sub( void *topic, int size, int port){
+ return shmModSocket.sub((char *)topic, size, port);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::sub_timeout( void *topic, int size, int port, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.sub_timeout((char *)topic, size, port, &timeout);
+}
+int NetModSocket::sub_nowait( void *topic, int size, int port){
+ return shmModSocket.sub_nowait((char *)topic, size, port);
+}
+
+
+
+/**
+ * 鍙栨秷璁㈤槄鎸囧畾涓婚
+ * @topic 涓婚
+ * @size 涓婚闀垮害
+ * @port 鎬荤嚎绔彛
+ */
+int NetModSocket::desub( void *topic, int size, int port){
+ return shmModSocket.desub((char *)topic, size, port);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::desub_timeout( void *topic, int size, int port, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.desub_timeout((char *)topic, size, port, &timeout);
+}
+int NetModSocket::desub_nowait( void *topic, int size, int port){
+ return shmModSocket.desub_nowait((char *)topic, size, port);
+}
+
+
+
+/**
+ * 鍙戝竷涓婚
+ * @topic 涓婚
+ * @content 涓婚鍐呭
+ * @port 鎬荤嚎绔彛
+ */
+int NetModSocket::pub( char *topic, int topic_size, void *content, int content_size, int port){
+ return shmModSocket.pub(topic, topic_size, content, content_size, port);
+}
+// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+int NetModSocket::pub_timeout( char *topic, int topic_size, void *content, int content_size, int port, int sec, int nsec){
+ struct timespec timeout = {sec, nsec};
+ return shmModSocket.pub_timeout(topic, topic_size, content, content_size, port, &timeout);
+}
+int NetModSocket::pub_nowait( char *topic, int topic_size, void *content, int content_size, int port){
+ return shmModSocket.pub_nowait(topic, topic_size, content, content_size, port);
+}
+
+
+/**
+ * 鑾峰彇soket绔彛鍙�
+ */
+int NetModSocket::get_port() {
+ return shmModSocket.get_port();
+}
+
+
void NetModSocket::free_recv_msg_arr(net_mod_recv_msg_t * arr, size_t size) {
for(int i =0; i< size; i++) {
@@ -516,6 +511,183 @@
free(arr);
}
+
+
+
+//======================================================================================
+
+
+
+int NetModSocket::write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size) {
+
+ int buf_size;
+ char *buf;
+ int max_buf_size;
+ if((buf = (char *)malloc(MAXBUF)) == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::NetModSocket malloc");
+ exit(1);
+ } else {
+ max_buf_size = MAXBUF;
+ }
+
+ buf_size = send_size + NET_MODE_REQUEST_HEAD_LENGTH;
+ if(max_buf_size < buf_size) {
+
+ if((buf = (char *)realloc(buf, buf_size)) == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::write_request realloc buf");
+ exit(1);
+ } 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, send_buf, send_size);
+
+ if(rio_writen(clientfd, buf, buf_size) != buf_size ) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::write_request rio_writen");
+ free(buf);
+ return -1;
+ }
+ free(buf);
+ return 0;
+}
+
+/**
+ * @return 0 鎴愬姛, 1 瀵规柟娌℃湁瀵瑰簲鐨刱ey, -1 缃戠粶閿欒
+ *
+ */
+int NetModSocket::read_response(int connfd, net_mod_recv_msg_t *recv_msg) {
+ int recv_size;
+ void *recv_buf;
+ char response_head_bs[NET_MODE_RESPONSE_HEAD_LENGTH];
+
+ 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;
+ }
+
+ response_head = NetModSocket::decode_response_head(response_head_bs);
+// printf(">>>> read_response %s\n", response_head.host);
+ if(response_head.code != 0) {
+ // 瀵规柟娌℃湁瀵瑰簲鐨刱ey
+ return 1;
+ }
+
+ recv_buf = malloc(response_head.content_length);
+ if(recv_buf == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::send malloc recv_buf");
+ exit(1);
+ }
+ if ( (recv_size = rio_readn(connfd, recv_buf, response_head.content_length) ) != response_head.content_length) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::read_response rio_readnb recv_buf");
+
+ return -1;
+ }
+
+ strcpy( recv_msg->host, response_head.host);
+ recv_msg->port = response_head.port;
+ recv_msg->key = response_head.key;
+ recv_msg->content = recv_buf;
+ recv_msg->content_length = recv_size;
+ return 0;
+}
+
+
+
+
+void NetModSocket::init_req_rep_req_resp_pool()
+{
+ /* Initially, there are no connected descriptors */
+ int i;
+ req_resp_pool.maxi = -1; //line:conc:echoservers:beginempty
+ for (i = 0; i < OPEN_MAX; i++) {
+ req_resp_pool.conns[i].fd = -1;
+ req_resp_pool.conns[i].events = 0;
+ }
+
+}
+
+int NetModSocket::connect( net_node_t *node) {
+ std::map<std::string, int>::iterator mapIter;
+ int connfd;
+ int i;
+ char mapKey[256];
+ char portstr[32];
+
+ sprintf(mapKey, "%s:%d", node->host, node->port);
+ mapIter = req_resp_pool.connectionMap.find(mapKey);
+ if( mapIter != req_resp_pool.connectionMap.end()) {
+ connfd = mapIter->second;
+// printf("hit: %s\n", mapKey);
+ } else {
+// 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, "connect %s:%d ", node->host, node->port);
+ return -1;
+ }
+ req_resp_pool.connectionMap.insert({mapKey, connfd});
+ }
+
+
+ for (i = 0; i < OPEN_MAX; i++) { /* Find an available slot */
+ if (req_resp_pool.conns[i].fd < 0)
+ {
+ /* Add connected descriptor to the req_resp_pool */
+ req_resp_pool.conns[i].fd = connfd;
+
+ req_resp_pool.conns[i].events = POLLIN;
+ /* Add the descriptor to descriptor set */
+ break;
+ }
+ }
+
+ if (i > req_resp_pool.maxi)
+ req_resp_pool.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;
+}
+
+void NetModSocket::close_connect(int connfd) {
+ int i;
+ char mapKey[256];
+ std::map<std::string, int>::iterator map_iter;
+ if(close(connfd) != 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModSocket::close_connect close");
+ }
+
+
+ for (i = 0; i <= req_resp_pool.maxi; i++) {
+ if(req_resp_pool.conns[i].fd == connfd) {
+ req_resp_pool.conns[i].fd = -1;
+ }
+ }
+
+ for ( map_iter = req_resp_pool.connectionMap.begin(); map_iter != req_resp_pool.connectionMap.end(); ) {
+ if(connfd == map_iter->second) {
+// std::cout << "map_iter->first==" << map_iter->first << std::endl;
+ map_iter = req_resp_pool.connectionMap.erase(map_iter);
+ } else {
+ ++map_iter;
+ }
+ }
+
+ LoggerFactory::getLogger()->debug( "closed %d\n", connfd);
+
+}
/**
uint32_t mod;
char host[NI_MAXHOST];
--
Gitblit v1.8.0