]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: fd: slightly simplify up _fd_delete_orphan()
authorWilly Tarreau <w@1wt.eu>
Wed, 24 Mar 2021 14:34:25 +0000 (15:34 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 24 Mar 2021 16:17:21 +0000 (17:17 +0100)
Let's release the port range earlier so that all zeroes are grouped
together and that the compiler can slightly simplify the code.

src/fd.c

index 6a63ec5560352710d61915cbf57abdf2d1b9fcca..b3ae2c40b8fb4751a4795eda979fad1e2f2a70d2 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -309,6 +309,8 @@ void _fd_delete_orphan(int fd)
        }
        if (cur_poller.clo)
                cur_poller.clo(fd);
+
+       port_range_release_port(fdinfo[fd].port_range, fdinfo[fd].local_port);
        polled_mask[fd].poll_recv = polled_mask[fd].poll_send = 0;
 
        fdtab[fd].state = 0;
@@ -316,7 +318,6 @@ void _fd_delete_orphan(int fd)
 #ifdef DEBUG_FD
        fdtab[fd].event_count = 0;
 #endif
-       port_range_release_port(fdinfo[fd].port_range, fdinfo[fd].local_port);
        fdinfo[fd].port_range = NULL;
        fdtab[fd].owner = NULL;
        fdtab[fd].exported = 0;