From aa2f3b2a9968bb4928463bdae05fb026d16b60bb Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 04 十二月 2020 19:07:01 +0800
Subject: [PATCH] 固定bus key
---
src/socket/net_mod_server_socket.c | 102 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 51e10e9..8959231 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -3,7 +3,10 @@
#include "socket_io.h"
#include "net_mod_socket_io.h"
#include "net_mod_socket.h"
+#include "key_def.h"
+static Logger * logger = LoggerFactory::getLogger();
+
NetModServerSocket::NetModServerSocket(int _port): listenfd(0), port(_port), max_buf(1024), max_topic_buf(256), max_response_buf(1024)
{
@@ -43,12 +46,13 @@
socklen_t clientlen;
struct sockaddr_storage clientaddr;
char portstr[32];
+ if (Signal(SIGPIPE, SIG_IGN) == SIG_ERR) err_msg(errno, "signal");
//shmModSocket = new ShmModSocket;
sprintf(portstr, "%d", port);
listenfd = open_listenfd(portstr);
if(listenfd < 0) {
- LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start");
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start . errno=%d", errno);
return -1;
}
init_pool(listenfd);
@@ -58,7 +62,7 @@
/* Wait for listening/connected descriptor(s) to become ready */
pool.ready_set = pool.read_set;
pool.nready = select(pool.maxfd + 1, &pool.ready_set, NULL, NULL, NULL);
-
+ // LoggerFactory::getLogger()->debug("select return \n");
/* If listening descriptor ready, add new client to pool */
if (FD_ISSET(listenfd, &pool.ready_set))
{
@@ -122,10 +126,12 @@
int NetModServerSocket::process_client(int connfd) {
net_mod_request_head_t request_head;
net_mod_response_head_t response_head;
+ int ret;
char request_head_bs[NET_MODE_REQUEST_HEAD_LENGTH];
void *recv_buf;
// char tmp[8196];
int recv_size, response_buf_size;
+ struct timespec timeout;
if (rio_readn(connfd, request_head_bs, NET_MODE_REQUEST_HEAD_LENGTH) != NET_MODE_REQUEST_HEAD_LENGTH)
{
@@ -133,13 +139,17 @@
}
request_head = NetModSocket::decode_request_head(request_head_bs);
+
+// printf("server received request from host = %s:%d, key = %d, timeout=%d,\n",
+// request_head.host, request_head.port , request_head.key, request_head.timeout);
if(request_head.content_length > max_buf) {
- buf = realloc(buf, request_head.content_length);
- max_buf = request_head.content_length;
- if(buf == NULL) {
- LoggerFactory::getLogger()->error(errno, "process_client realloc");
+
+ if( (buf = realloc(buf, request_head.content_length)) == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc buf");
exit(1);
+ } else {
+ max_buf = request_head.content_length;
}
}
@@ -147,21 +157,51 @@
return -1;
}
+
if(request_head.mod == REQ_REP) {
- if(shmModSocket.sendandrecv_unsafe(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size) != 0) {
- response_head.code = 1;
+
+ memcpy(response_head.host, request_head.host, NI_MAXHOST);
+ response_head.port = request_head.port;
+ response_head.key = request_head.key;
+
+
+ if(request_head.timeout > 0) {
+ timeout.tv_sec = request_head.timeout / 1000;
+ timeout.tv_nsec = (request_head.timeout - timeout.tv_sec * 1000) * 10e6;
+
+ // printf(" timeout.tv_sec = %d, timeout.tv_nsec=%ld\n", timeout.tv_sec, timeout.tv_nsec );
+
+ ret = shmModSocket.sendandrecv_unsafe_timeout(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size, &timeout);
+ }
+ else if(request_head.timeout == 0) {
+ ret = shmModSocket.sendandrecv_unsafe_nowait(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size);
+ }
+ else if(request_head.timeout == -1) {
+ ret = shmModSocket.sendandrecv_unsafe(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size);
+ }
+
+ if( ret != 0) {
+ // 娌℃湁瀵瑰簲鐨刱ey
+ response_head.code = ret;
response_head.content_length = 0;
if( rio_writen(connfd, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH) != NET_MODE_RESPONSE_HEAD_LENGTH )
return -1;
//Rio_writen(connfd, recv_buf, recv_size);
} else {
+ // 鍙戦�佹垚鍔�
response_head.code = 0;
response_head.content_length = recv_size;
response_buf_size = NET_MODE_RESPONSE_HEAD_LENGTH + recv_size;
if(max_response_buf < response_buf_size) {
- buf = (char *)realloc(response_buf, response_buf_size);
- max_response_buf = response_buf_size;
+ if( (response_buf = (char *)realloc(response_buf, response_buf_size)) == NULL ) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc response_buf");
+ exit(1);
+ } else {
+ max_response_buf = response_buf_size;
+ }
+
+
}
memcpy(response_buf, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH);
memcpy(response_buf + NET_MODE_RESPONSE_HEAD_LENGTH, recv_buf, recv_size);
@@ -176,19 +216,40 @@
} else if(request_head.mod == BUS) {
if(request_head.topic_length > max_topic_buf) {
- topic_buf = realloc(topic_buf, request_head.topic_length);
- max_topic_buf = request_head.topic_length;
- if(topic_buf == NULL) {
- LoggerFactory::getLogger()->error(errno, "process_client realloc");
+ if( (topic_buf = realloc(topic_buf, request_head.topic_length)) == NULL ) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc topic_buf");
exit(1);
+ } else {
+ max_topic_buf = request_head.topic_length;
}
}
if (rio_readn(connfd, topic_buf, request_head.topic_length) != request_head.topic_length ) {
return -1;
}
-LoggerFactory::getLogger()->debug("====server pub %s===\n", buf);
- shmModSocket.pub((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, request_head.key);
+// LoggerFactory::getLogger()->debug("====server pub %s===\n", buf);
+ memcpy(response_head.host, request_head.host, NI_MAXHOST);
+ response_head.port = request_head.port;
+ // response_head.key = request_head.key;
+
+ if(request_head.timeout > 0) {
+ timeout.tv_sec = request_head.timeout / 1000;
+ timeout.tv_nsec = (request_head.timeout - timeout.tv_sec * 1000) * 10e6;
+ ret = shmModSocket.pub_timeout((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY, &timeout);
+ }
+ else if(request_head.timeout == 0) {
+ ret = shmModSocket.pub_nowait((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY);
+ }
+ else if(request_head.timeout == -1) {
+ ret = shmModSocket.pub((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY);
+ }
+
+ response_head.code = ret;
+ response_head.content_length = 0;
+ if( rio_writen(connfd, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH) != NET_MODE_RESPONSE_HEAD_LENGTH )
+ return -1;
+
+
}
return 0;
@@ -199,8 +260,6 @@
void NetModServerSocket::check_clients()
{
int i, connfd;
- //rio_t *rio;
-
for (i = 0; (i <= pool.maxi) && (pool.nready > 0); i++)
{
@@ -211,10 +270,13 @@
{
pool.nready--;
if(process_client(connfd) != 0) {
- LoggerFactory::getLogger()->debug("===server close client %d\n", connfd);
- Close(connfd); //line:conc:echoservers:closeconnfd
+
+
+ Close(connfd);
FD_CLR(connfd, &pool.read_set);
pool.clientfd[i] = -1;
+ logger->debug("===server close client %d\n", connfd);
+ // printf("===server close client %d\n", connfd);
}
}
--
Gitblit v1.8.0