RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-26 04:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] sepoll: don't count two events on the same FD.

Browse Source 
sepoll counts the number of speculative events it has processed in
order to remain fair with epoll_wait(). If a same FD is processed
both for read and for write, it is counted twice. Fix this.
This commit is contained in:
Willy Tarreau 2009-03-28 21:10:48 +01:00
parent 1714e0ffda
commit 6574519c23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ev_sepoll.c
View File

@ -331,6 +331,8 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
status = 0; status = 0;
spec_idx = nbspec; spec_idx = nbspec;
while (likely(spec_idx > 0)) { while (likely(spec_idx > 0)) {
int done;
spec_idx--; spec_idx--;
fd = spec_list[spec_idx]; fd = spec_list[spec_idx];
eo = fd_list[fd].e; /* save old events */ eo = fd_list[fd].e; /* save old events */
@ -355,6 +357,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
fd, fdtab[fd].ev, fd_list[fd].e, fd_list[fd].s1, spec_idx); fd, fdtab[fd].ev, fd_list[fd].e, fd_list[fd].s1, spec_idx);
} }
#endif #endif
done = 0;
fdtab[fd].ev &= FD_POLL_STICKY; fdtab[fd].ev &= FD_POLL_STICKY;
if ((eo & FD_EV_MASK_R) == FD_EV_SPEC_R) { if ((eo & FD_EV_MASK_R) == FD_EV_SPEC_R) {
/* The owner is interested in reading from this FD */ /* The owner is interested in reading from this FD */
@ -364,7 +367,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (!fdtab[fd].cb[DIR_RD].f(fd)) if (!fdtab[fd].cb[DIR_RD].f(fd))
fd_list[fd].e ^= (FD_EV_WAIT_R ^ FD_EV_SPEC_R); fd_list[fd].e ^= (FD_EV_WAIT_R ^ FD_EV_SPEC_R);
else else
status++; done = 1;
} }
} }
else if ((eo & FD_EV_MASK_R) == FD_EV_STOP_R) { else if ((eo & FD_EV_MASK_R) == FD_EV_STOP_R) {
@ -380,7 +383,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (!fdtab[fd].cb[DIR_WR].f(fd)) if (!fdtab[fd].cb[DIR_WR].f(fd))
fd_list[fd].e ^= (FD_EV_WAIT_W ^ FD_EV_SPEC_W); fd_list[fd].e ^= (FD_EV_WAIT_W ^ FD_EV_SPEC_W);
else else
status++; done = 1;
} }
} }
else if ((eo & FD_EV_MASK_W) == FD_EV_STOP_W) { else if ((eo & FD_EV_MASK_W) == FD_EV_STOP_W) {
@ -388,6 +391,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
fd_list[fd].e &= ~FD_EV_MASK_W; fd_list[fd].e &= ~FD_EV_MASK_W;
} }
status += done;
/* one callback might already have closed the fd by itself */ /* one callback might already have closed the fd by itself */
if (fdtab[fd].state == FD_STCLOSE) if (fdtab[fd].state == FD_STCLOSE)
continue; continue;