]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: epoll: get rid of the now useless fd_compute_new_polled_status()
authorWilly Tarreau <w@1wt.eu>
Wed, 17 Jan 2018 20:51:21 +0000 (21:51 +0100)
committerWilly Tarreau <w@1wt.eu>
Mon, 5 Feb 2018 15:02:22 +0000 (16:02 +0100)
Do not call it anymore and avoid updating the fdstate. We're not very far
from removing the fd lock it seems.

src/ev_epoll.c

index 924c083b251a5091a71b8b7f1eed1f0b974e60aa..3edaf288cb6e44aa98a39586d30439aea104c3b0 100644 (file)
@@ -64,7 +64,7 @@ REGPRM1 static void __fd_clo(int fd)
  */
 REGPRM2 static void _do_poll(struct poller *p, int exp)
 {
-       int status, eo, en;
+       int status, en;
        int fd, opcode;
        int count;
        int updt_idx;
@@ -81,9 +81,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
 
                HA_SPIN_LOCK(FD_LOCK, &fdtab[fd].lock);
                fdtab[fd].update_mask &= ~tid_bit;
-               eo = fdtab[fd].state;
-               en = fd_compute_new_polled_status(eo);
-               fdtab[fd].state = en;
+               en = fdtab[fd].state;
                HA_SPIN_UNLOCK(FD_LOCK, &fdtab[fd].lock);
 
                if (fdtab[fd].polled_mask & tid_bit) {