mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-08 10:51:06 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: connections: Make rcv_buf mandatory and nuke cs_recv().

Browse Source 
Reintroduce h2_rcv_buf(), right now it just does what cs_recv() did, but
should be modified later.
This commit is contained in:
Olivier Houchard 2018-08-16 15:30:32 +02:00 committed by Willy Tarreau
parent 77e8919fc6
commit 511efeae7e
5 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/proto/connection.h
View File

@ -304,17 +304,6 @@ static inline void cs_update_mux_polling(struct conn_stream *cs)
conn->mux->update_poll(cs);
}
/* conn_stream receive function. Uses mux->rcv_buf() if defined, otherwise
* falls back to __cs_recv().
*/
static inline size_t cs_recv(struct conn_stream *cs, struct buffer *buf, size_t count, int flags)
{
if (cs->conn->mux->rcv_buf)
return cs->conn->mux->rcv_buf(cs, buf, count, flags);
else
return __cs_recv(cs, buf, count, flags);
}
/* conn_stream send function. Uses mux->snd_buf() if defined, otherwise
* falls back to __cs_send().
*/

4
src/checks.c
View File

@ -850,7 +850,7 @@ static void event_srv_chk_r(struct conn_stream *cs)
done = 0;
cs_recv(cs, &check->bi, b_size(&check->bi), 0);
cs->conn->mux->rcv_buf(cs, &check->bi, b_size(&check->bi), 0);
if (conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH) || cs->flags & CS_FL_ERROR) {
done = 1;
if ((conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR) && !b_data(&check->bi)) {
@ -2917,7 +2917,7 @@ static int tcpcheck_main(struct check *check)
goto out_end_tcpcheck;
__cs_want_recv(cs);
if (cs_recv(cs, &check->bi, b_size(&check->bi), 0) <= 0) {
if (cs->conn->mux->rcv_buf(cs, &check->bi, b_size(&check->bi), 0) <= 0) {
if (conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH) || cs->flags & CS_FL_ERROR) {
done = 1;
if ((conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR) && !b_data(&check->bi)) {

27
src/connection.c
View File

@ -383,33 +383,6 @@ int conn_sock_drain(struct connection *conn)
return 1;
}
/*
* default conn_stream recv() : this one is used when cs->rcv_buf == NULL.
* It reads up to <count> bytes from cs->rxbuf, puts them into <buf> and
* returns the count. It possibly sets/clears CS_FL_RCV_MORE depending on the
* buffer's state, and may set CS_FL_EOS. The number of bytes transferred is
* returned. <buf> is not touched if <count> is null, but cs flags will be
* updated to indicate any RCV_MORE or EOS.
*/
size_t __cs_recv(struct conn_stream *cs, struct buffer *buf, size_t count, int flags)
{
size_t ret = 0;
/* transfer possibly pending data to the upper layer */
ret = b_xfer(buf, &cs->rxbuf, count);
if (b_data(&cs->rxbuf))
cs->flags |= CS_FL_RCV_MORE;
else {
cs->flags &= ~CS_FL_RCV_MORE;
if (cs->flags & CS_FL_REOS)
cs->flags |= CS_FL_EOS;
cs_drop_rxbuf(cs);
}
return ret;
}
/*
* default cs send() : this one is used when mux->snd_buf == NULL. It puts up to
* <count> bytes from <buf> into cs->txbuf. The number of bytes transferred is

21
src/mux_h2.c
View File

@ -3414,6 +3414,26 @@ static int h2_subscribe(struct conn_stream *cs, int event_type, void *param)
}
/* Called from the upper layer, to receive data */
static size_t h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t count, int flags)
{
size_t ret = 0;
/* transfer possibly pending data to the upper layer */
ret = b_xfer(buf, &cs->rxbuf, count);
if (b_data(&cs->rxbuf))
cs->flags |= CS_FL_RCV_MORE;
else {
cs->flags &= ~CS_FL_RCV_MORE;
if (cs->flags & CS_FL_REOS)
cs->flags |= CS_FL_EOS;
cs_drop_rxbuf(cs);
}
return ret;
}
/* Called from the upper layer, to send data */
static size_t h2_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t count, int flags)
{
@ -3591,6 +3611,7 @@ const struct mux_ops h2_ops = {
.wake = h2_wake,
.update_poll = h2_update_poll,
.snd_buf = h2_snd_buf,
.rcv_buf = h2_rcv_buf,
.subscribe = h2_subscribe,
.attach = h2_attach,
.detach = h2_detach,

2
src/stream_interface.c
View File

@ -1244,7 +1244,7 @@ static void si_cs_recv_cb(struct conn_stream *cs)
break;
}
ret = cs_recv(cs, &ic->buf, max, co_data(ic) ? CO_RFL_BUF_WET : 0);
ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, co_data(ic) ? CO_RFL_BUF_WET : 0);
if (cs->flags & CS_FL_RCV_MORE)
si->flags |= SI_FL_WAIT_ROOM;