lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 04:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

move fd_set from stack to heap (in socket_server) , It avoid FD_ZERO every time.

Browse Source
This commit is contained in:
云风
2014-02-24 17:03:34 +08:00
parent 4fd53c1364
commit 665b2fae93
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
skynet-src/socket_server.c
View File

@@ -58,6 +58,7 @@ struct socket_server {
struct event ev[MAX_EVENT]; struct event ev[MAX_EVENT];
struct socket slot[MAX_SOCKET]; struct socket slot[MAX_SOCKET];
char buffer[MAX_INFO]; char buffer[MAX_INFO];
fd_set rfds;
}; };
struct request_open { struct request_open {
@@ -184,6 +185,8 @@ socket_server_create() {
ss->alloc_id = 0; ss->alloc_id = 0;
ss->event_n = 0; ss->event_n = 0;
ss->event_index = 0; ss->event_index = 0;
FD_ZERO(&ss->rfds);
assert(ss->recvctrl_fd < FD_SETSIZE);
return ss; return ss;
} }
@@ -532,14 +535,12 @@ block_readpipe(int pipefd, void *buffer, int sz) {
static int static int
has_cmd(struct socket_server *ss) { has_cmd(struct socket_server *ss) {
fd_set rfds;
struct timeval tv = {0,0}; struct timeval tv = {0,0};
int retval; int retval;
FD_ZERO(&rfds); FD_SET(ss->recvctrl_fd, &ss->rfds);
FD_SET(ss->recvctrl_fd, &rfds);
retval = select(ss->recvctrl_fd+1, &rfds, NULL, NULL, &tv); retval = select(ss->recvctrl_fd+1, &ss->rfds, NULL, NULL, &tv);
if (retval == 1) { if (retval == 1) {
return 1; return 1;
} }