RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-03 16:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: connection: make conn_drain() perform more controls

Browse Source 
Currently si_idle_conn_null_cb() has to perform some low-level checks
over the file descriptor and the connection configuration that should
only belong to conn_drain(). Let's move these controls there. The
function now automatically checks for errors and hangups on the file
descriptor for example, and disables recv polling if there's no drain
function at the control layer.
This commit is contained in:
Willy Tarreau 2015-03-13 00:32:20 +01:00
parent 0a03c0f022
commit f31fb07958
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/proto/connection.h
View File

@ -552,17 +552,25 @@ static inline int conn_drain(struct connection *conn)
if (!conn_ctrl_ready(conn))
return 1;
if (conn->flags & CO_FL_SOCK_RD_SH)
if (conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH))
return 1;
if (!fd_recv_ready(conn->t.sock.fd))
return 0;
if (fdtab[conn->t.sock.fd].ev & (FD_POLL_ERR|FD_POLL_HUP)) {
fdtab[conn->t.sock.fd].linger_risk = 0;
}
else {
if (!fd_recv_ready(conn->t.sock.fd))
return 0;
if (!conn->ctrl->drain)
return 0;
/* disable draining if we were called and have no drain function */
if (!conn->ctrl->drain) {
__conn_data_stop_recv(conn);
return 0;
}
if (conn->ctrl->drain(conn->t.sock.fd) <= 0)
return 0;
if (conn->ctrl->drain(conn->t.sock.fd) <= 0)
return 0;
}
conn->flags |= CO_FL_SOCK_RD_SH;
return 1;

15
src/stream_interface.c
View File

@ -497,20 +497,7 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
*/
static void si_idle_conn_null_cb(struct connection *conn)
{
if (conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH))
return;
if (fdtab[conn->t.sock.fd].ev & (FD_POLL_ERR|FD_POLL_HUP)) {
fdtab[conn->t.sock.fd].linger_risk = 0;
conn->flags |= CO_FL_SOCK_RD_SH;
}
else {
conn_drain(conn);
}
/* disable draining if we were called and have no drain function */
if (!conn->ctrl->drain)
__conn_data_stop_recv(conn);
conn_drain(conn);
}
/* Callback to be used by connection I/O handlers when some activity is detected