MINOR: h2: keep a count of the number of conn_streams attached to the mux
The h2 mux only knows about the number of H2 streams which are not in a
CLOSED state. This is used for protocol compliance. But it doesn't hold
the number of really attached streams. It is a problem because depending
on scheduling, it is possible that more streams are attached to the mux
than the ones seen at the protocol level, due to some streams taking some
time to be detached. Let's add this count based on the conn_streams.
Note: this patch is part of a series of fixes which will have to be
backported to 1.8.
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 57b1722..819a70a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -113,7 +113,7 @@
int timeout; /* idle timeout duration in ticks */
int shut_timeout; /* idle timeout duration in ticks after GOAWAY was sent */
unsigned int nb_streams; /* number of streams in the tree */
- /* 32 bit hole here */
+ unsigned int nb_cs; /* number of attached conn_streams */
struct task *task; /* timeout management task */
struct eb_root streams_by_id; /* all active streams by their ID */
struct list send_list; /* list of blocked streams requesting to send */
@@ -352,6 +352,7 @@
h2c->rcvd_c = 0;
h2c->rcvd_s = 0;
h2c->nb_streams = 0;
+ h2c->nb_cs = 0;
h2c->dbuf = &buf_empty;
h2c->dsi = -1;
@@ -632,6 +633,7 @@
h2s->cs = cs;
cs->ctx = h2s;
+ h2c->nb_cs++;
if (stream_create_from_cs(cs) < 0)
goto out_free_cs;
@@ -640,6 +642,7 @@
return h2s;
out_free_cs:
+ h2c->nb_cs--;
cs_free(cs);
out_close:
h2s_destroy(h2s);
@@ -2441,6 +2444,7 @@
h2c = h2s->h2c;
h2s->cs = NULL;
+ h2c->nb_cs--;
/* this stream may be blocked waiting for some data to leave (possibly
* an ES or RST frame), so orphan it in this case.
@@ -3431,8 +3435,8 @@
node = eb32_next(node);
}
- chunk_appendf(msg, " st0=%d flg=0x%08x fctl_cnt=%d send_cnt=%d tree_cnt=%d orph_cnt=%d",
- h2c->st0, h2c->flags, fctl_cnt, send_cnt, tree_cnt, orph_cnt);
+ chunk_appendf(msg, " st0=%d flg=0x%08x nbst=%u nbcs=%u fctl_cnt=%d send_cnt=%d tree_cnt=%d orph_cnt=%d",
+ h2c->st0, h2c->flags, h2c->nb_streams, h2c->nb_cs, fctl_cnt, send_cnt, tree_cnt, orph_cnt);
}
/*******************************************************/