RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 21:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] two missing states in sepoll transition matrix

Browse Source 
Two states were missing in the speculative epoll state transition
matrix. This could cause some timeouts and unhandled events. The
problem showed up in TCP mode with a fast server at high session
rates, but could in theory also affect HTTP mode.
This commit is contained in:
Willy Tarreau 2007-05-09 21:57:51 +02:00
parent 61beedfb8c
commit dc246a7f3e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ev_sepoll.c
View File

@ -232,10 +232,16 @@ REGPRM1 static void __fd_clo(int fd)
fd_list[fd].e &= ~(FD_EV_MASK);
}
/*
* operations to perform when reaching _do_poll() for some FDs in the spec
* queue depending on their state. This is mainly used to cleanup some FDs
* which are in STOP state. It is also used to compute EPOLL* flags when
* switching from SPEC to WAIT.
*/
static struct ev_to_epoll {
char op; // epoll opcode to switch from spec to wait, 0 if none
char m; // inverted mask for existing events
char ev; // remainint epoll events after change
char ev; // remaining epoll events after change
char pad;
} ev_to_epoll[16] = {
[FD_EV_IDLE_W | FD_EV_STOP_R] = { .op=EPOLL_CTL_DEL, .m=FD_EV_MASK_R },
@ -245,6 +251,8 @@ static struct ev_to_epoll {
[FD_EV_WAIT_W | FD_EV_STOP_R] = { .op=EPOLL_CTL_MOD, .m=FD_EV_MASK_R, .ev=EPOLLOUT },
[FD_EV_STOP_W | FD_EV_WAIT_R] = { .op=EPOLL_CTL_MOD, .m=FD_EV_MASK_W, .ev=EPOLLIN },
[FD_EV_STOP_W | FD_EV_STOP_R] = { .op=EPOLL_CTL_DEL, .m=FD_EV_MASK_R|FD_EV_MASK_W },
[FD_EV_SPEC_W | FD_EV_WAIT_R] = { .ev=EPOLLIN },
[FD_EV_WAIT_W | FD_EV_SPEC_R] = { .ev=EPOLLOUT },
[FD_EV_WAIT_W | FD_EV_WAIT_R] = { .ev=EPOLLIN|EPOLLOUT },
};
@ -274,10 +282,10 @@ REGPRM2 static void _do_poll(struct poller *p, int wait_time)
opcode = ev_to_epoll[fd_list[fd].e].op;
if (opcode) {
ev.events = ev_to_epoll[fd_list[fd].e].ev;
ev.data.fd = fd;
epoll_ctl(epoll_fd, opcode, fd, &ev);
ev.events = ev_to_epoll[fd_list[fd].e].ev;
fd_list[fd].e &= ~(unsigned int)ev_to_epoll[fd_list[fd].e].m;
epoll_ctl(epoll_fd, opcode, fd, &ev);
}
if (!(fd_list[fd].e & FD_EV_RW_SL)) {