gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: h2: make h2_frt_decode_headers() use an intermediary buffer

Browse Source 
The purpose is to decode to a temporary buffer and then to copy this buffer
to the caller. This double-copy definitely has an impact on performance, the
test code goes down from 220k to 140k req/s, but this memcpy() will disappear
soon.

The test on CO_RFL_BUF_WET has become irrelevant now since we only use
the cs' rxbuf, so we cannot be blocked by "output" data that has to be
forwarded first. Thus instead we don't start until the rxbuf is empty
(it will be drained from any input data once the stream processes it).
This commit is contained in:
Willy Tarreau 2018-02-26 15:22:17 +01:00
parent 0b559071dd
commit 937f760e1e
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mux_h2.c
View File

@ -2669,6 +2669,7 @@ static int h2_frt_decode_headers(struct h2s *h2s, struct buffer *buf, int count,
struct http_hdr list[MAX_HTTP_HDR * 2]; struct http_hdr list[MAX_HTTP_HDR * 2];
struct buffer *copy = NULL; struct buffer *copy = NULL;
unsigned int msgf; unsigned int msgf;
struct buffer *csbuf;
int flen = h2c->dfl; int flen = h2c->dfl;
int outlen = 0; int outlen = 0;
int wrap; int wrap;
@ -2731,31 +2732,22 @@ static int h2_frt_decode_headers(struct h2s *h2s, struct buffer *buf, int count,
goto fail; goto fail;
} }
csbuf = h2_get_buf(h2c, &h2s->cs->rxbuf);
if (!csbuf) {
h2c->flags |= H2_CF_DEM_SALLOC;
goto fail;
}
/* we can't retry a failed decompression operation so we must be very /* we can't retry a failed decompression operation so we must be very
* careful not to take any risks. In practice the output buffer is * careful not to take any risks. In practice the output buffer is
* always empty except maybe for trailers, so these operations almost * always empty except maybe for trailers, in which case we simply have
* never happen. * to wait for the upper layer to finish consuming what is available.
*/ */
if (flags & CO_RFL_BUF_WET) { if (b_data(csbuf))
/* need to let the output buffer flush and
* mark the buffer for later wake up.
*/
goto fail;
}
if (unlikely(b_space_wraps(buf))) {
/* it doesn't fit and the buffer is fragmented,
* so let's defragment it and try again.
*/
b_slow_realign(buf, trash.area, 0);
}
try = b_contig_space(buf);
if (!try)
goto fail; goto fail;
if (try > count) csbuf->head = 0;
try = count; try = b_size(csbuf);
outlen = hpack_decode_frame(h2c->ddht, hdrs, flen, list, outlen = hpack_decode_frame(h2c->ddht, hdrs, flen, list,
sizeof(list)/sizeof(list[0]), tmp); sizeof(list)/sizeof(list[0]), tmp);
@ -2766,7 +2758,7 @@ static int h2_frt_decode_headers(struct h2s *h2s, struct buffer *buf, int count,
/* OK now we have our header list in <list> */ /* OK now we have our header list in <list> */
msgf = (h2c->dff & H2_F_DATA_END_STREAM) ? 0 : H2_MSGF_BODY; msgf = (h2c->dff & H2_F_DATA_END_STREAM) ? 0 : H2_MSGF_BODY;
outlen = h2_make_h1_request(list, b_tail(buf), try, &msgf); outlen = h2_make_h1_request(list, b_tail(csbuf), try, &msgf);
if (outlen < 0) { if (outlen < 0) {
h2c_error(h2c, H2_ERR_COMPRESSION_ERROR); h2c_error(h2c, H2_ERR_COMPRESSION_ERROR);
@ -2784,19 +2776,19 @@ static int h2_frt_decode_headers(struct h2s *h2s, struct buffer *buf, int count,
/* now consume the input data */ /* now consume the input data */
b_del(&h2c->dbuf, h2c->dfl); b_del(&h2c->dbuf, h2c->dfl);
h2c->st0 = H2_CS_FRAME_H; h2c->st0 = H2_CS_FRAME_H;
b_add(buf, outlen); b_add(csbuf, outlen);
/* don't send it before returning data! if (h2c->dff & H2_F_HEADERS_END_STREAM)
* FIXME: should we instead try to send it much later, after the
* response ? This would require that we keep a copy of it in h2s.
*/
if (h2c->dff & H2_F_HEADERS_END_STREAM) {
h2s->cs->flags |= CS_FL_EOS;
h2s->flags |= H2_SF_ES_RCVD; h2s->flags |= H2_SF_ES_RCVD;
}
outlen = b_xfer(buf, csbuf, count);
if (!b_data(csbuf) && (h2s->flags & H2_SF_ES_RCVD))
h2s->cs->flags |= CS_FL_EOS;
leave: leave:
free_trash_chunk(copy); free_trash_chunk(copy);
cs_drop_rxbuf(h2s->cs);
return outlen; return outlen;
fail: fail:
outlen = 0; outlen = 0;