mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: stream_interface: cleanup loop information in si_conn_send_loop()

Browse Source 
Though si_conn_send_loop() does not loop over ->snd_buf() after commit ed7f836,
there is still some codes left which use `while` but only execute once. This
commit does the cleanup job and rename si_conn_send_loop() to si_conn_send().

Signed-off-by: Godbach <nylzhaowei@gmail.com>
This commit is contained in:
Godbach 2013-10-11 15:48:29 +08:00 committed by Willy Tarreau
parent 2c42ef5b91
commit e68e02dc1d
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/stream_interface.c
View File

@ -609,10 +609,10 @@ static int si_conn_wake_cb(struct connection *conn)
/* /*
* This function is called to send buffer data to a stream socket. * This function is called to send buffer data to a stream socket.
* It returns -1 in case of unrecoverable error, otherwise zero. * It returns -1 in case of unrecoverable error, otherwise zero.
* It iterates the transport layer's snd_buf function. It relies on the * It calls the transport layer's snd_buf function. It relies on the
* caller to commit polling changes. * caller to commit polling changes.
*/ */
static int si_conn_send_loop(struct connection *conn) static int si_conn_send(struct connection *conn)
{ {
struct stream_interface *si = conn->owner; struct stream_interface *si = conn->owner;
struct channel *chn = si->ob; struct channel *chn = si->ob;
@ -638,10 +638,10 @@ static int si_conn_send_loop(struct connection *conn)
if (!chn->buf->o) if (!chn->buf->o)
return 0; return 0;
/* when we're in this loop, we already know that there is no spliced /* when we're here, we already know that there is no spliced
* data left, and that there are sendable buffered data. * data left, and that there are sendable buffered data.
*/ */
while (!(conn->flags & (CO_FL_ERROR | CO_FL_SOCK_WR_SH | CO_FL_DATA_WR_SH | CO_FL_WAIT_DATA | CO_FL_WAIT_WR | CO_FL_HANDSHAKE))) { if (!(conn->flags & (CO_FL_ERROR | CO_FL_SOCK_WR_SH | CO_FL_DATA_WR_SH | CO_FL_WAIT_DATA | CO_FL_WAIT_WR | CO_FL_HANDSHAKE))) {
/* check if we want to inform the kernel that we're interested in /* check if we want to inform the kernel that we're interested in
* sending more data after this call. We want this if : * sending more data after this call. We want this if :
* - we're about to close after this last send and want to merge * - we're about to close after this last send and want to merge
@ -661,22 +661,19 @@ static int si_conn_send_loop(struct connection *conn)
send_flag |= MSG_MORE; send_flag |= MSG_MORE;
ret = conn->xprt->snd_buf(conn, chn->buf, send_flag); ret = conn->xprt->snd_buf(conn, chn->buf, send_flag);
if (ret <= 0) if (ret > 0) {
break; chn->flags |= CF_WRITE_PARTIAL;
chn->flags |= CF_WRITE_PARTIAL; if (!chn->buf->o) {
/* Always clear both flags once everything has been sent, they're one-shot */
chn->flags &= ~(CF_EXPECT_MORE | CF_SEND_DONTWAIT);
}
if (!chn->buf->o) { /* if some data remain in the buffer, it's only because the
/* Always clear both flags once everything has been sent, they're one-shot */ * system buffers are full, we will try next time.
chn->flags &= ~(CF_EXPECT_MORE | CF_SEND_DONTWAIT); */
break;
} }
}
/* if some data remain in the buffer, it's only because the
* system bufers are full, so we don't want to loop again.
*/
break;
} /* while */
if (conn->flags & CO_FL_ERROR) if (conn->flags & CO_FL_ERROR)
return -1; return -1;
@ -824,7 +821,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
conn_refresh_polling_flags(si->conn); conn_refresh_polling_flags(si->conn);
if (si_conn_send_loop(si->conn) < 0) { if (si_conn_send(si->conn) < 0) {
/* Write error on the file descriptor */ /* Write error on the file descriptor */
fd_stop_both(si->conn->t.sock.fd); fd_stop_both(si->conn->t.sock.fd);
__conn_data_stop_both(si->conn); __conn_data_stop_both(si->conn);
@ -1145,7 +1142,7 @@ static void si_conn_send_cb(struct connection *conn)
return; return;
/* OK there are data waiting to be sent */ /* OK there are data waiting to be sent */
if (si_conn_send_loop(conn) < 0) if (si_conn_send(conn) < 0)
goto out_error; goto out_error;
/* OK all done */ /* OK all done */