RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-17 20:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: threads/polling: pollers now handle FDs depending on the process mask

Browse Source
This commit is contained in:
Christopher Faulet 2017-06-02 14:36:39 +02:00 committed by Willy Tarreau
parent 8aae8b1d61
commit 63e2ce61a8
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ev_epoll.c
View File

@ -136,7 +136,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
unsigned int e = epoll_events[count].events;
fd = epoll_events[count].data.fd;
if (!fdtab[fd].owner)
if (!fdtab[fd].owner || !(fdtab[fd].process_mask & tid_bit))
continue;
/* it looks complicated but gcc can optimize it away when constants

2
src/ev_kqueue.c
View File

@ -122,7 +122,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
unsigned int n = 0;
fd = kev[count].ident;
if (!fdtab[fd].owner)
if (!fdtab[fd].owner || !(fdtab[fd].process_mask & tid_bit))
continue;
if (kev[count].filter == EVFILT_READ) {

4
src/ev_poll.c
View File

@ -111,6 +111,10 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
continue;
for (count = 0, fd = fds * 8*sizeof(**fd_evts); count < 8*sizeof(**fd_evts) && fd < maxfd; count++, fd++) {
if (!fdtab[fd].owner || !(fdtab[fd].process_mask & tid_bit))
continue;
sr = (rn >> count) & 1;
sw = (wn >> count) & 1;
if ((sr|sw)) {

2
src/ev_select.c
View File

@ -141,7 +141,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
/* if we specify read first, the accepts and zero reads will be
* seen first. Moreover, system buffers will be flushed faster.
*/
if (!fdtab[fd].owner)
if (!fdtab[fd].owner || !(fdtab[fd].process_mask & tid_bit))
continue;
if (FD_ISSET(fd, tmp_evts[DIR_RD]))