Skip to content

Commit 5a49e9b

Browse files
a-denoyellea-denoyelle
committed
MINOR: mux_quic: use QCM_ as prefix for trace events
This patch is part of a renaming affecting mux_quic and related files. Naming "qcm" will become the new marker for common mux_quic stuffs, shared both on QUIC and QMux protocols. The final objective is to limit "qmux" naming for stuffs related to the new experimental protocol of the same name. The current patch performs a large renaming as every mux_quic trace events are adjusted with the new QCM_EV_ prefix.
1 parent 0fba376 commit 5a49e9b

6 files changed

Lines changed: 380 additions & 380 deletions

File tree

‎include/haproxy/qcm_trace.h‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,58 @@ extern struct trace_source trace_qcm;
1414
#define TRACE_SOURCE &trace_qcm
1515

1616
static const struct trace_event qcm_trace_events[] = {
17-
#define QMUX_EV_QCC_NEW (1ULL << 0)
18-
{ .mask = QMUX_EV_QCC_NEW , .name = "qcc_new", .desc = "new QUIC connection" },
19-
#define QMUX_EV_QCC_RECV (1ULL << 1)
20-
{ .mask = QMUX_EV_QCC_RECV, .name = "qcc_recv", .desc = "Rx on QUIC connection" },
21-
#define QMUX_EV_QCC_SEND (1ULL << 2)
22-
{ .mask = QMUX_EV_QCC_SEND, .name = "qcc_send", .desc = "Tx on QUIC connection" },
23-
#define QMUX_EV_QCC_WAKE (1ULL << 3)
24-
{ .mask = QMUX_EV_QCC_WAKE, .name = "qcc_wake", .desc = "QUIC connection woken up" },
25-
#define QMUX_EV_QCC_END (1ULL << 4)
26-
{ .mask = QMUX_EV_QCC_END, .name = "qcc_end", .desc = "QUIC connection terminated" },
27-
#define QMUX_EV_QCC_NQCS (1ULL << 5)
28-
{ .mask = QMUX_EV_QCC_NQCS, .name = "qcc_no_qcs", .desc = "QUIC stream not found" },
29-
#define QMUX_EV_QCS_NEW (1ULL << 6)
30-
{ .mask = QMUX_EV_QCS_NEW, .name = "qcs_new", .desc = "new QUIC stream" },
31-
#define QMUX_EV_QCS_RECV (1ULL << 7)
32-
{ .mask = QMUX_EV_QCS_RECV, .name = "qcs_recv", .desc = "Rx on QUIC stream" },
33-
#define QMUX_EV_QCS_SEND (1ULL << 8)
34-
{ .mask = QMUX_EV_QCS_SEND, .name = "qcs_send", .desc = "Tx on QUIC stream" },
35-
#define QMUX_EV_QCS_END (1ULL << 9)
36-
{ .mask = QMUX_EV_QCS_END, .name = "qcs_end", .desc = "QUIC stream terminated" },
37-
#define QMUX_EV_STRM_RECV (1ULL << 10)
38-
{ .mask = QMUX_EV_STRM_RECV, .name = "strm_recv", .desc = "receiving data for stream" },
39-
#define QMUX_EV_STRM_SEND (1ULL << 11)
40-
{ .mask = QMUX_EV_STRM_SEND, .name = "strm_send", .desc = "sending data for stream" },
41-
#define QMUX_EV_STRM_WAKE (1ULL << 12)
42-
{ .mask = QMUX_EV_STRM_WAKE, .name = "strm_wake", .desc = "stream woken up" },
43-
#define QMUX_EV_STRM_SHUT (1ULL << 13)
44-
{ .mask = QMUX_EV_STRM_SHUT, .name = "strm_shut", .desc = "stream shutdown" },
45-
#define QMUX_EV_STRM_END (1ULL << 14)
46-
{ .mask = QMUX_EV_STRM_END, .name = "strm_end", .desc = "detaching app-layer stream" },
47-
#define QMUX_EV_SEND_FRM (1ULL << 15)
48-
{ .mask = QMUX_EV_SEND_FRM, .name = "send_frm", .desc = "sending QUIC frame" },
17+
#define QCM_EV_QCC_NEW (1ULL << 0)
18+
{ .mask = QCM_EV_QCC_NEW , .name = "qcc_new", .desc = "new QUIC connection" },
19+
#define QCM_EV_QCC_RECV (1ULL << 1)
20+
{ .mask = QCM_EV_QCC_RECV, .name = "qcc_recv", .desc = "Rx on QUIC connection" },
21+
#define QCM_EV_QCC_SEND (1ULL << 2)
22+
{ .mask = QCM_EV_QCC_SEND, .name = "qcc_send", .desc = "Tx on QUIC connection" },
23+
#define QCM_EV_QCC_WAKE (1ULL << 3)
24+
{ .mask = QCM_EV_QCC_WAKE, .name = "qcc_wake", .desc = "QUIC connection woken up" },
25+
#define QCM_EV_QCC_END (1ULL << 4)
26+
{ .mask = QCM_EV_QCC_END, .name = "qcc_end", .desc = "QUIC connection terminated" },
27+
#define QCM_EV_QCC_NQCS (1ULL << 5)
28+
{ .mask = QCM_EV_QCC_NQCS, .name = "qcc_no_qcs", .desc = "QUIC stream not found" },
29+
#define QCM_EV_QCS_NEW (1ULL << 6)
30+
{ .mask = QCM_EV_QCS_NEW, .name = "qcs_new", .desc = "new QUIC stream" },
31+
#define QCM_EV_QCS_RECV (1ULL << 7)
32+
{ .mask = QCM_EV_QCS_RECV, .name = "qcs_recv", .desc = "Rx on QUIC stream" },
33+
#define QCM_EV_QCS_SEND (1ULL << 8)
34+
{ .mask = QCM_EV_QCS_SEND, .name = "qcs_send", .desc = "Tx on QUIC stream" },
35+
#define QCM_EV_QCS_END (1ULL << 9)
36+
{ .mask = QCM_EV_QCS_END, .name = "qcs_end", .desc = "QUIC stream terminated" },
37+
#define QCM_EV_STRM_RECV (1ULL << 10)
38+
{ .mask = QCM_EV_STRM_RECV, .name = "strm_recv", .desc = "receiving data for stream" },
39+
#define QCM_EV_STRM_SEND (1ULL << 11)
40+
{ .mask = QCM_EV_STRM_SEND, .name = "strm_send", .desc = "sending data for stream" },
41+
#define QCM_EV_STRM_WAKE (1ULL << 12)
42+
{ .mask = QCM_EV_STRM_WAKE, .name = "strm_wake", .desc = "stream woken up" },
43+
#define QCM_EV_STRM_SHUT (1ULL << 13)
44+
{ .mask = QCM_EV_STRM_SHUT, .name = "strm_shut", .desc = "stream shutdown" },
45+
#define QCM_EV_STRM_END (1ULL << 14)
46+
{ .mask = QCM_EV_STRM_END, .name = "strm_end", .desc = "detaching app-layer stream" },
47+
#define QCM_EV_SEND_FRM (1ULL << 15)
48+
{ .mask = QCM_EV_SEND_FRM, .name = "send_frm", .desc = "sending QUIC frame" },
4949
/* special event dedicated to qcs_xfer_data */
50-
#define QMUX_EV_QCS_XFER_DATA (1ULL << 16)
51-
{ .mask = QMUX_EV_QCS_XFER_DATA, .name = "qcs_xfer_data", .desc = "qcs_xfer_data" },
50+
#define QCM_EV_QCS_XFER_DATA (1ULL << 16)
51+
{ .mask = QCM_EV_QCS_XFER_DATA, .name = "qcs_xfer_data", .desc = "qcs_xfer_data" },
5252
/* special event dedicated to qcs_build_stream_frm */
53-
#define QMUX_EV_QCS_BUILD_STRM (1ULL << 17)
54-
{ .mask = QMUX_EV_QCS_BUILD_STRM, .name = "qcs_build_stream_frm", .desc = "qcs_build_stream_frm" },
55-
#define QMUX_EV_PROTO_ERR (1ULL << 18)
56-
{ .mask = QMUX_EV_PROTO_ERR, .name = "proto_err", .desc = "protocol error" },
57-
#define QMUX_EV_QCC_ERR (1ULL << 19)
58-
{ .mask = QMUX_EV_QCC_ERR, .name = "qcc_err", .desc = "connection on error" },
53+
#define QCM_EV_QCS_BUILD_STRM (1ULL << 17)
54+
{ .mask = QCM_EV_QCS_BUILD_STRM, .name = "qcs_build_stream_frm", .desc = "qcs_build_stream_frm" },
55+
#define QCM_EV_PROTO_ERR (1ULL << 18)
56+
{ .mask = QCM_EV_PROTO_ERR, .name = "proto_err", .desc = "protocol error" },
57+
#define QCM_EV_QCC_ERR (1ULL << 19)
58+
{ .mask = QCM_EV_QCC_ERR, .name = "qcc_err", .desc = "connection on error" },
5959
{ }
6060
};
6161

62-
/* custom arg for QMUX_EV_QCS_XFER_DATA */
62+
/* custom arg for QCM_EV_QCS_XFER_DATA */
6363
struct qcs_xfer_data_trace_arg {
6464
size_t prep;
6565
int xfer;
6666
};
6767

68-
/* custom arg for QMUX_EV_QCS_BUILD_STRM */
68+
/* custom arg for QCM_EV_QCS_BUILD_STRM */
6969
struct qcs_build_stream_trace_arg {
7070
size_t len;
7171
char fin;

‎src/hq_interop.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static size_t hq_interop_snd_buf(struct qcs *qcs, struct buffer *buf,
219219
htx_nbblks(htx) == 1 && btype == HTX_BLK_DATA)) {
220220
void *old_area = res->area;
221221

222-
TRACE_DATA("perform zero-copy DATA transfer", QMUX_EV_STRM_SEND,
222+
TRACE_DATA("perform zero-copy DATA transfer", QCM_EV_STRM_SEND,
223223
qcs->qcc->conn, qcs);
224224

225225
/* remap MUX buffer to HTX area */

0 commit comments

Comments
 (0)