lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

check command pipe in high freq

Browse Source
This commit is contained in:
云风
2013-12-20 00:31:26 +08:00
parent fd45a3b003
commit 7b50e01627
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
skynet-src/socket_server.c
View File

@@ -49,6 +49,7 @@ struct socket {
struct socket_server { struct socket_server {
int recvctrl_fd; int recvctrl_fd;
int sendctrl_fd; int sendctrl_fd;
int checkctrl;
poll_fd event_fd; poll_fd event_fd;
int alloc_id; int alloc_id;
int event_n; int event_n;
@@ -171,6 +172,7 @@ socket_server_create() {
ss->event_fd = efd; ss->event_fd = efd;
ss->recvctrl_fd = fd[0]; ss->recvctrl_fd = fd[0];
ss->sendctrl_fd = fd[1]; ss->sendctrl_fd = fd[1];
ss->checkctrl = 1;
for (i=0;i<MAX_SOCKET;i++) { for (i=0;i<MAX_SOCKET;i++) {
struct socket *s = &ss->slot[i]; struct socket *s = &ss->slot[i];
@@ -522,6 +524,22 @@ block_readpipe(int pipefd, void *buffer, int sz) {
} }
} }
static int
has_cmd(struct socket_server *ss) {
fd_set rfds;
struct timeval tv = {0,0};
int retval;
FD_ZERO(&rfds);
FD_SET(ss->recvctrl_fd, &rfds);
retval = select(ss->recvctrl_fd+1, &rfds, NULL, NULL, &tv);
if (retval == 1) {
return 1;
}
return 0;
}
// return type // return type
static int static int
ctrl_cmd(struct socket_server *ss, struct socket_message *result) { ctrl_cmd(struct socket_server *ss, struct socket_message *result) {
@@ -670,12 +688,25 @@ report_accept(struct socket_server *ss, struct socket *s, struct socket_message
return 1; return 1;
} }
// return type // return type
int int
socket_server_poll(struct socket_server *ss, struct socket_message * result, int * more) { socket_server_poll(struct socket_server *ss, struct socket_message * result, int * more) {
for (;;) { for (;;) {
if (ss->checkctrl) {
if (has_cmd(ss)) {
int type = ctrl_cmd(ss, result);
if (type != -1)
return type;
else
continue;
} else {
ss->checkctrl = 0;
}
}
if (ss->event_index == ss->event_n) { if (ss->event_index == ss->event_n) {
ss->event_n = sp_wait(ss->event_fd, ss->ev, MAX_EVENT); ss->event_n = sp_wait(ss->event_fd, ss->ev, MAX_EVENT);
ss->checkctrl = 1;
if (more) { if (more) {
*more = 0; *more = 0;
} }
@@ -688,11 +719,8 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
struct event *e = &ss->ev[ss->event_index++]; struct event *e = &ss->ev[ss->event_index++];
struct socket *s = e->s; struct socket *s = e->s;
if (s == NULL) { if (s == NULL) {
int type = ctrl_cmd(ss, result); // dispatch pipe message at beginning
if (type != -1) continue;
return type;
else
continue;
} }
switch (s->type) { switch (s->type) {
case SOCKET_TYPE_CONNECTING: case SOCKET_TYPE_CONNECTING: