mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-24 13:42:16 +00:00
MEDIUM: fd: mark the FD as ready when it's inserted
Given that all our I/Os are now directed from top to bottom and not the opposite way around, and the FD cache was removed, it doesn't make sense anymore to create FDs that are marked not ready since this would prevent the first accesses unless the caller explicitly does an fd_may_recv() which is not expected to be its job (which conn_ctrl_init() has to do by the way). Let's move this into fd_insert() instead, and have a single atomic operation for both directions via fd_may_both().
This commit is contained in:
parent
5762a0db0a
commit
4ac9d064d2
@ -123,9 +123,6 @@ static inline void conn_ctrl_init(struct connection *conn)
|
||||
int fd = conn->handle.fd;
|
||||
|
||||
fd_insert(fd, conn, conn_fd_handler, tid_bit);
|
||||
/* mark the fd as ready so as not to needlessly poll at the beginning */
|
||||
fd_may_recv(fd);
|
||||
fd_may_send(fd);
|
||||
conn->flags |= CO_FL_CTRL_READY;
|
||||
}
|
||||
}
|
||||
|
@ -241,6 +241,14 @@ static inline void fd_may_recv(const int fd)
|
||||
return;
|
||||
}
|
||||
|
||||
/* Report that FD <fd> may receive and send without polling. Used at FD
|
||||
* initialization.
|
||||
*/
|
||||
static inline void fd_may_both(const int fd)
|
||||
{
|
||||
HA_ATOMIC_OR(&fdtab[fd].state, FD_EV_READY_RW);
|
||||
}
|
||||
|
||||
/* Disable readiness when active. This is useful to interrupt reading when it
|
||||
* is suspected that the end of data might have been reached (eg: short read).
|
||||
* This can only be done using level-triggered pollers, so if any edge-triggered
|
||||
@ -339,6 +347,8 @@ static inline void fd_insert(int fd, void *owner, void (*iocb)(int fd), unsigned
|
||||
*/
|
||||
if (locked)
|
||||
HA_SPIN_UNLOCK(FD_LOCK, &fdtab[fd].lock);
|
||||
/* the two directions are ready until proven otherwise */
|
||||
fd_may_both(fd);
|
||||
_HA_ATOMIC_ADD(&ha_used_fds, 1);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user