MINOR: mux-quic: count in-progress requests
Add a new qcc member named <nb_hreq>. Its purpose is close to <nb_sc>
which represents the number of attached stream connectors. Both are
incremented inside qc_attach_sc().
The difference is on the decrement operation. While <nb_cs> is
decremented on sedesc detach callback, <nb_hreq> is decremented when the
qcs is locally closed.
In most cases, <nb_hreq> will be decremented before <nb_cs>. However, it
will be the reverse if a stream must be kept alive after detach callback.
The main purpose of this field is to implement http-keep-alive timeout.
Both <nb_sc> and <nb_hreq> must be null to activate the http-keep-alive
timeout.
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index 748500d..f7e538b 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -33,6 +33,7 @@
struct qcc {
struct connection *conn;
uint64_t nb_sc; /* number of attached stream connectors */
+ uint64_t nb_hreq; /* number of in-progress http requests */
uint32_t flags; /* QC_CF_* */
struct {
diff --git a/include/haproxy/mux_quic.h b/include/haproxy/mux_quic.h
index 0ad94cf..bf0a18e 100644
--- a/include/haproxy/mux_quic.h
+++ b/include/haproxy/mux_quic.h
@@ -107,6 +107,7 @@
return NULL;
++qcc->nb_sc;
+ ++qcc->nb_hreq;
/* TODO duplicated from mux_h2 */
sess->accept_date = date;
diff --git a/src/mux_quic.c b/src/mux_quic.c
index a801c96..549bcb0 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -229,6 +229,20 @@
return qcs->sd ? qcs->sd->sc : NULL;
}
+/* Decrement <qcc> sc. */
+static forceinline void qcc_rm_sc(struct qcc *qcc)
+{
+ BUG_ON_HOT(!qcc->nb_sc);
+ --qcc->nb_sc;
+}
+
+/* Decrement <qcc> hreq. */
+static forceinline void qcc_rm_hreq(struct qcc *qcc)
+{
+ BUG_ON_HOT(!qcc->nb_hreq);
+ --qcc->nb_hreq;
+}
+
/* Mark a stream as open if it was idle. This can be used on every
* successful emission/reception operation to update the stream state.
*/
@@ -254,6 +268,7 @@
if (quic_stream_is_bidi(qcs->id)) {
qcs->st = (qcs->st == QC_SS_HREM) ? QC_SS_CLO : QC_SS_HLOC;
+ qcc_rm_hreq(qcs->qcc);
}
else {
/* Only local uni streams are valid for this operation. */
@@ -1780,7 +1795,7 @@
qcc->conn = conn;
conn->ctx = qcc;
- qcc->nb_sc = 0;
+ qcc->nb_hreq = qcc->nb_sc = 0;
qcc->flags = 0;
qcc->app_ops = NULL;
@@ -1912,7 +1927,8 @@
* BUG_ON_HOT() statement can be adjusted.
*/
//BUG_ON_HOT(!qcs_is_close_remote(qcs));
- --qcc->nb_sc;
+
+ qcc_rm_sc(qcc);
if (!qcs_is_close_local(qcs) && !(qcc->conn->flags & CO_FL_ERROR)) {
TRACE_DEVEL("leaving with remaining data, detaching qcs", QMUX_EV_STRM_END, qcc->conn, qcs);