upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-07-16 12:23:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

MINOR: connection: move the cleanup of flag CO_FL_WAIT_ROOM

Browse source 
This flag is only used when reading using splicing for now, and is only
set when a pipe full condition is met, so we can simplify its reset
condition in conn_refresh_polling_flags so that it's cleared at the
same time as the other ones, only when the control layer is ready.

This flag could be used more, to mark that a buffer full condition was
met with any receive method in order to simplify polling management.
This should probably be revisited after 1.8.
This commit is contained in:
Willy Tarreau 2017-10-25 10:28:45 +02:00
parent 8de70bcb54
commit bc97cc4fd1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/proto/connection.h
View file

@ -171,11 +171,10 @@ void conn_update_xprt_polling(struct connection *c);
*/
static inline void conn_refresh_polling_flags(struct connection *conn)
{
conn->flags &= ~CO_FL_WAIT_ROOM;
if (conn_ctrl_ready(conn)) {
unsigned int flags = conn->flags & ~(CO_FL_CURR_RD_ENA | CO_FL_CURR_WR_ENA);
unsigned int flags = conn->flags;
flags &= ~(CO_FL_CURR_RD_ENA | CO_FL_CURR_WR_ENA | CO_FL_WAIT_ROOM);
if (fd_recv_active(conn->handle.fd))
flags |= CO_FL_CURR_RD_ENA;
if (fd_send_active(conn->handle.fd))