From af85260254bacac40a68d4f5f61950523beb3a27 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 19 十月 2020 17:02:41 +0800
Subject: [PATCH] update
---
src/socket/net_mod_server_socket.c | 140 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 37 deletions(-)
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 198894b..51e10e9 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -4,25 +4,55 @@
#include "net_mod_socket_io.h"
#include "net_mod_socket.h"
-NetModServerSocket::NetModServerSocket(int port)
+NetModServerSocket::NetModServerSocket(int _port): listenfd(0), port(_port), max_buf(1024), max_topic_buf(256), max_response_buf(1024)
{
- char portstr[32];
+
- //shmModSocket = new ShmModSocket;
- sprintf(portstr, "%d", port);
- listenfd = Open_listenfd(portstr);
- init_pool(listenfd);
+ buf = malloc(max_buf);
+ if(buf == NULL) {
+ err_exit(errno, "NetModServerSocket::NetModServerSocket malloc");
+ }
+
+ topic_buf = malloc(max_topic_buf);
+ if(topic_buf == NULL) {
+ err_exit(errno, "NetModServerSocket::NetModServerSocket malloc");
+ }
+
+ response_buf = (char *) malloc(max_response_buf);
+ if(response_buf == NULL) {
+ err_exit(errno, "NetModServerSocket::NetModServerSocket malloc");
+ }
}
NetModServerSocket::~NetModServerSocket() {
- Close(listenfd);
+ if(listenfd != 0) {
+ Close(listenfd);
+ }
+
+ if(buf != NULL)
+ free(buf);
+ if(topic_buf != NULL)
+ free(topic_buf);
+ if(response_buf != NULL)
+ free(response_buf);
}
-void NetModServerSocket::start() {
+int NetModServerSocket::start() {
int connfd;
socklen_t clientlen;
struct sockaddr_storage clientaddr;
+ char portstr[32];
+
+ //shmModSocket = new ShmModSocket;
+ sprintf(portstr, "%d", port);
+ listenfd = open_listenfd(portstr);
+ if(listenfd < 0) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start");
+ return -1;
+ }
+ init_pool(listenfd);
+
while (1)
{
/* Wait for listening/connected descriptor(s) to become ready */
@@ -40,6 +70,7 @@
/* Echo a text line from each ready connected descriptor */
check_clients();
}
+ return 0;
}
void NetModServerSocket::init_pool(int listenfd)
@@ -61,12 +92,12 @@
{
int i;
pool.nready--;
- for (i = 0; i < FD_SETSIZE; i++) /* Find an available slot */
+ for (i = 0; i < FD_SETSIZE; i++) {/* Find an available slot */
if (pool.clientfd[i] < 0)
{
/* Add connected descriptor to the pool */
pool.clientfd[i] = connfd; //line:conc:echoservers:beginaddclient
- Rio_readinitb(&pool.clientrio[i], connfd); //line:conc:echoservers:endaddclient
+ // Rio_readinitb(&pool.clientrio[i], connfd); //line:conc:echoservers:endaddclient
/* Add the descriptor to descriptor set */
FD_SET(connfd, &pool.read_set); //line:conc:echoservers:addconnfd
@@ -78,51 +109,86 @@
pool.maxi = i; //line:conc:echoservers:endmaxi
break;
}
- if (i == FD_SETSIZE) /* Couldn't find an empty slot */
- err_msg(errno, "add_client error: Too many clients");
+ }
+ if (i == FD_SETSIZE) {
+ /* Couldn't find an empty slot */
+ LoggerFactory::getLogger()->error(errno, "add_client error: Too many clients");
+
+ }
}
/* $end add_client */
-int NetModServerSocket::process_client(rio_t *rio, int connfd) {
- int n;
+int NetModServerSocket::process_client(int connfd) {
net_mod_request_head_t request_head;
net_mod_response_head_t response_head;
+ char request_head_bs[NET_MODE_REQUEST_HEAD_LENGTH];
void *recv_buf;
- static void *buf;
- int recv_size;
+// char tmp[8196];
+ int recv_size, response_buf_size;
- static size_t max_buf = 1024;
- if(buf == NULL) {
- buf = malloc(max_buf);
- if(buf == NULL) {
- err_exit(errno, "process_client malloc");
- }
- }
-
-
- if ((n = rio_readnb(rio, &request_head, sizeof(net_mod_request_head_t))) != sizeof(net_mod_request_head_t))
+ if (rio_readn(connfd, request_head_bs, NET_MODE_REQUEST_HEAD_LENGTH) != NET_MODE_REQUEST_HEAD_LENGTH)
{
return -1;
}
+
+ request_head = NetModSocket::decode_request_head(request_head_bs);
if(request_head.content_length > max_buf) {
buf = realloc(buf, request_head.content_length);
max_buf = request_head.content_length;
if(buf == NULL) {
- err_exit(errno, "process_client realloc");
+ LoggerFactory::getLogger()->error(errno, "process_client realloc");
+ exit(1);
}
}
- if ((n = rio_readnb(rio, buf, request_head.content_length)) != request_head.content_length ) {
+ if (rio_readn(connfd, buf, request_head.content_length) != request_head.content_length ) {
return -1;
}
if(request_head.mod == REQ_REP) {
- shmModSocket.sendandrecv(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size);
- response_head.content_length = recv_size;
- Rio_writen(connfd, &response_head, sizeof(response_head));
- Rio_writen(connfd, recv_buf, recv_size);
+ if(shmModSocket.sendandrecv_unsafe(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size) != 0) {
+ response_head.code = 1;
+ 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;
+ }
+ 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);
+
+ if(rio_writen(connfd, response_buf, response_buf_size) != response_buf_size) {
+ return -1;
+ }
+
+ }
+ return 0;
+
+
+ } 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");
+ exit(1);
+ }
+ }
+
+ 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);
}
return 0;
@@ -133,22 +199,22 @@
void NetModServerSocket::check_clients()
{
int i, connfd;
- rio_t *rio;
+ //rio_t *rio;
for (i = 0; (i <= pool.maxi) && (pool.nready > 0); i++)
{
connfd = pool.clientfd[i];
- rio = &pool.clientrio[i];
/* If the descriptor is ready, echo a text line from it */
if ((connfd > 0) && (FD_ISSET(connfd, &pool.ready_set)))
{
pool.nready--;
- if(process_client(rio, connfd) != 0) {
+ if(process_client(connfd) != 0) {
+ LoggerFactory::getLogger()->debug("===server close client %d\n", connfd);
Close(connfd); //line:conc:echoservers:closeconnfd
- FD_CLR(connfd, &pool.read_set); //line:conc:echoservers:beginremove
- pool.clientfd[i] = -1; //line:conc:echoservers:endremove
+ FD_CLR(connfd, &pool.read_set);
+ pool.clientfd[i] = -1;
}
}
--
Gitblit v1.8.0