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

MINOR: h2: fuse h2s_detach() and h2s_free() into h2s_destroy()

Browse Source 
Since these two functions are always used together, let's simplify
the code by having a single one for both operations. It also ensures
we don't leave wandering elements that risk to leak later.
This commit is contained in:
Willy Tarreau 2018-03-28 13:56:39 +02:00
parent e323f3458c
commit 71049cce3f
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mux_h2.c
View File

@ -590,18 +590,13 @@ static inline void h2s_close(struct h2s *h2s)
h2s->st = H2_SS_CLOSED; h2s->st = H2_SS_CLOSED;
} }
/* detaches an H2 stream from its H2C. */ /* detaches an H2 stream from its H2C and releases it to the H2S pool. */
static void h2s_detach(struct h2s *h2s) static void h2s_destroy(struct h2s *h2s)
{ {
h2s_close(h2s); h2s_close(h2s);
LIST_DEL(&h2s->list); LIST_DEL(&h2s->list);
LIST_INIT(&h2s->list); LIST_INIT(&h2s->list);
eb32_delete(&h2s->by_id); eb32_delete(&h2s->by_id);
}
/* releases an H2 stream back to the pool, and detaches it from the h2c. */
static void h2s_free(struct h2s *h2s)
{
pool_free(pool_head_h2s, h2s); pool_free(pool_head_h2s, h2s);
} }
@ -649,8 +644,7 @@ static struct h2s *h2c_stream_new(struct h2c *h2c, int id)
out_free_cs: out_free_cs:
cs_free(cs); cs_free(cs);
out_close: out_close:
h2s_detach(h2s); h2s_destroy(h2s);
h2s_free(h2s);
h2s = NULL; h2s = NULL;
out: out:
return h2s; return h2s;
@ -1028,8 +1022,7 @@ static void h2_wake_some_streams(struct h2c *h2c, int last, uint32_t flags)
if (!h2s->cs) { if (!h2s->cs) {
/* this stream was already orphaned */ /* this stream was already orphaned */
h2s_detach(h2s); h2s_destroy(h2s);
h2s_free(h2s);
continue; continue;
} }
@ -2060,8 +2053,7 @@ static int h2_process_mux(struct h2c *h2c)
h2s->cs->flags &= ~CS_FL_DATA_WR_ENA; h2s->cs->flags &= ~CS_FL_DATA_WR_ENA;
else { else {
/* just sent the last frame for this orphaned stream */ /* just sent the last frame for this orphaned stream */
h2s_detach(h2s); h2s_destroy(h2s);
h2s_free(h2s);
} }
} }
} }
@ -2102,8 +2094,7 @@ static int h2_process_mux(struct h2c *h2c)
h2s->cs->flags &= ~CS_FL_DATA_WR_ENA; h2s->cs->flags &= ~CS_FL_DATA_WR_ENA;
else { else {
/* just sent the last frame for this orphaned stream */ /* just sent the last frame for this orphaned stream */
h2s_detach(h2s); h2s_destroy(h2s);
h2s_free(h2s);
} }
} }
} }
@ -2466,8 +2457,7 @@ static void h2_detach(struct conn_stream *cs)
conn_xprt_want_send(cs->conn); conn_xprt_want_send(cs->conn);
} }
h2s_detach(h2s); h2s_destroy(h2s);
h2s_free(h2s);
/* We don't want to close right now unless we're removing the /* We don't want to close right now unless we're removing the
* last stream, and either the connection is in error, or it * last stream, and either the connection is in error, or it