RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-20 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream-int: Factorize processing done after sending data in si_cs_send()

Browse Source 
In the function si_cs_send(), what is done when an error occurred on the
connection or the conn_stream or when some successfully data was send via a pipe
or the channel's buffer may be factorized at the function. It slightly simplify
the function.

This patch must be backported to 2.0 and 1.9 because a bugfix depends on it.
This commit is contained in:
Christopher Faulet 2019-07-05 11:49:11 +02:00
parent 0e54d547f1
commit 86162db15c
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/stream_interface.c
View File

@ -669,23 +669,14 @@ int si_cs_send(struct conn_stream *cs)
if (oc->pipe && conn->xprt->snd_pipe && conn->mux->snd_pipe) { if (oc->pipe && conn->xprt->snd_pipe && conn->mux->snd_pipe) {
ret = conn->mux->snd_pipe(cs, oc->pipe); ret = conn->mux->snd_pipe(cs, oc->pipe);
if (ret > 0) { if (ret > 0)
oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA;
did_send = 1; did_send = 1;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
}
if (!oc->pipe->data) { if (!oc->pipe->data) {
put_pipe(oc->pipe); put_pipe(oc->pipe);
oc->pipe = NULL; oc->pipe = NULL;
} }
if (conn->flags & CO_FL_ERROR || cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING)) {
si->flags |= SI_FL_ERR;
return 1;
}
if (oc->pipe) if (oc->pipe)
goto end; goto end;
} }
@ -752,10 +743,6 @@ int si_cs_send(struct conn_stream *cs)
ret = cs->conn->mux->snd_buf(cs, &oc->buf, co_data(oc), send_flag); ret = cs->conn->mux->snd_buf(cs, &oc->buf, co_data(oc), send_flag);
if (ret > 0) { if (ret > 0) {
did_send = 1; did_send = 1;
oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
co_set_data(oc, co_data(oc) - ret); co_set_data(oc, co_data(oc) - ret);
c_realign_if_empty(oc); c_realign_if_empty(oc);
@ -763,19 +750,24 @@ int si_cs_send(struct conn_stream *cs)
/* Always clear both flags once everything has been sent, they're one-shot */ /* Always clear both flags once everything has been sent, they're one-shot */
oc->flags &= ~(CF_EXPECT_MORE | CF_SEND_DONTWAIT); oc->flags &= ~(CF_EXPECT_MORE | CF_SEND_DONTWAIT);
} }
/* if some data remain in the buffer, it's only because the /* if some data remain in the buffer, it's only because the
* system buffers are full, we will try next time. * system buffers are full, we will try next time.
*/ */
} }
}
end:
if (did_send) {
oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
}
if (conn->flags & CO_FL_ERROR || cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING)) { if (conn->flags & CO_FL_ERROR || cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING)) {
si->flags |= SI_FL_ERR; si->flags |= SI_FL_ERR;
return 1; return 1;
} }
}
end:
/* We couldn't send all of our data, let the mux know we'd like to send more */ /* We couldn't send all of our data, let the mux know we'd like to send more */
if (!channel_is_empty(oc)) if (!channel_is_empty(oc))
conn->mux->subscribe(cs, SUB_RETRY_SEND, &si->wait_event); conn->mux->subscribe(cs, SUB_RETRY_SEND, &si->wait_event);