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

MINOR: mux-h2: introduce h2_release_mbuf() to release all buffers in the mbuf ring

Browse Source 
This function iterates over all buffers in the mbuf ring to release all
of them from the head to the tail.
This commit is contained in:
Willy Tarreau 2019-05-26 09:45:23 +02:00
parent 662fafc02b
commit 2e3c000c1c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mux_h2.c
View File

@ -432,6 +432,19 @@ static inline void h2_release_buf(struct h2c *h2c, struct buffer *bptr)
}
}
static inline void h2_release_mbuf(struct h2c *h2c)
{
struct buffer *buf;
unsigned int count = 0;
while (b_size(buf = br_head_pick(h2c->mbuf))) {
b_free(buf);
count++;
}
if (count)
offer_buffers(h2c->buf_wait.target, tasks_run_queue);
}
/* returns the number of allocatable outgoing streams for the connection taking
* the last_sid and the reserved ones into account.
*/
@ -654,7 +667,7 @@ static void h2_release(struct h2c *h2c)
HA_SPIN_UNLOCK(BUF_WQ_LOCK, &buffer_wq_lock);
h2_release_buf(h2c, &h2c->dbuf);
h2_release_buf(h2c, br_tail(h2c->mbuf));
h2_release_mbuf(h2c);
if (h2c->task) {
h2c->task->context = NULL;
@ -2915,7 +2928,7 @@ static int h2_process(struct h2c *h2c)
!br_data(h2c->mbuf) &&
(h2c->mws <= 0 || LIST_ISEMPTY(&h2c->fctl_list)) &&
((h2c->flags & H2_CF_MUX_BLOCK_ANY) || LIST_ISEMPTY(&h2c->send_list))))
h2_release_buf(h2c, br_tail(h2c->mbuf));
h2_release_mbuf(h2c);
if (h2c->task) {
if (eb_is_empty(&h2c->streams_by_id) || br_data(h2c->mbuf)) {