From a448227ba1ea986aba4c4ea724c5aacd651c23f2 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 27 May 2022 09:11:02 +0200 Subject: [PATCH] CLEANUP: quic: drop the name "conn_stream" from the pool variable names QUIC was the last user of entities with "conn_stream" in their names, though there's no more reason for this given that the pool names were already pretty straightforward. The renaming does this: qc_stream_desc: pool_head_quic_conn_stream -> pool_head_quic_stream_desc qc_stream_buf: pool_head_quic_conn_stream_buf -> pool_head_quic_stream_buf --- src/quic_stream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/quic_stream.c b/src/quic_stream.c index a0ac936bd..205ee76aa 100644 --- a/src/quic_stream.c +++ b/src/quic_stream.c @@ -9,9 +9,9 @@ #include #include -DECLARE_STATIC_POOL(pool_head_quic_conn_stream, "qc_stream_desc", +DECLARE_STATIC_POOL(pool_head_quic_stream_desc, "qc_stream_desc", sizeof(struct qc_stream_desc)); -DECLARE_STATIC_POOL(pool_head_quic_conn_stream_buf, "qc_stream_buf", +DECLARE_STATIC_POOL(pool_head_quic_stream_buf, "qc_stream_buf", sizeof(struct qc_stream_buf)); @@ -25,7 +25,7 @@ struct qc_stream_desc *qc_stream_desc_new(uint64_t id, enum qcs_type type, void { struct qc_stream_desc *stream; - stream = pool_alloc(pool_head_quic_conn_stream); + stream = pool_alloc(pool_head_quic_stream_desc); if (!stream) return NULL; @@ -117,7 +117,7 @@ int qc_stream_desc_ack(struct qc_stream_desc **stream, size_t offset, size_t len } b_free(buf); - pool_free(pool_head_quic_conn_stream_buf, stream_buf); + pool_free(pool_head_quic_stream_buf, stream_buf); offer_buffers(NULL, 1); /* notify MUX about available buffers. */ @@ -157,7 +157,7 @@ void qc_stream_desc_free(struct qc_stream_desc *stream) if (!(b_data(&buf->buf))) { b_free(&buf->buf); LIST_DELETE(&buf->list); - pool_free(pool_head_quic_conn_stream_buf, buf); + pool_free(pool_head_quic_stream_buf, buf); ++free_count; } @@ -194,7 +194,7 @@ void qc_stream_desc_free(struct qc_stream_desc *stream) } eb64_delete(&stream->by_id); - pool_free(pool_head_quic_conn_stream, stream); + pool_free(pool_head_quic_stream_desc, stream); } /* Return the current buffer of . May be NULL if not allocated. */ @@ -235,7 +235,7 @@ struct buffer *qc_stream_buf_alloc(struct qc_stream_desc *stream, ++qc->stream_buf_count; stream->buf_offset = offset; - stream->buf = pool_alloc(pool_head_quic_conn_stream_buf); + stream->buf = pool_alloc(pool_head_quic_stream_buf); if (!stream->buf) return NULL;