BUG/MINOR: poll: the I/O handler was called twice for polled I/Os

When a polled I/O event is detected, the event is added to the updates
list and the I/O handler is called. Upon return, if the event handler
did not experience an EAGAIN, the event remains in the updates list so
that it will be processed later. But if the event was already in the
spec list, its state is updated and it will be called again immediately
upon exit, by fd_process_spec_events(), so this creates unfairness
between speculative events and polled events.

So don't call the I/O handler upon I/O detection when the FD already is
in the spec list. The fd events are still updated so that the spec list
is up to date with the possible I/O change.
This commit is contained in:
Willy Tarreau 2012-12-14 00:17:03 +01:00
parent fb5470d144
commit 39ebef82aa
4 changed files with 26 additions and 0 deletions

View File

@ -179,6 +179,11 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (fdtab[fd].ev & FD_POLL_OUT)
fd_ev_set(fd, DIR_WR);
if (fdtab[fd].spec_p) {
/* This fd was already scheduled for being called as a speculative I/O */
continue;
}
/* Save number of updates to detect creation of new FDs. */
old_updt = fd_nbupdt;
fdtab[fd].iocb(fd);

View File

@ -158,6 +158,13 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (fdtab[fd].ev & FD_POLL_OUT)
fd_ev_set(fd, DIR_WR);
if (fdtab[fd].spec_p) {
/* This fd was already scheduled for being
* called as a speculative I/O.
*/
continue;
}
fdtab[fd].iocb(fd);
}
}

View File

@ -181,6 +181,13 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (fdtab[fd].ev & FD_POLL_OUT)
fd_ev_set(fd, DIR_WR);
if (fdtab[fd].spec_p) {
/* This fd was already scheduled for being
* called as a speculative I/O
*/
continue;
}
fdtab[fd].iocb(fd);
}
}

View File

@ -167,6 +167,13 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
if (fdtab[fd].ev & FD_POLL_OUT)
fd_ev_set(fd, DIR_WR);
if (fdtab[fd].spec_p) {
/* This fd was already scheduled for being
* called as a speculative I/O.
*/
continue;
}
fdtab[fd].iocb(fd);
}
}