mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-20 13:21:29 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: h3: add traces for stream sending function

Browse Source 
Replace h3_debug_printf() by real trace for functions used by stream
layer snd_buf callback. A new event type H3_EV_STRM_SEND is created for
the occasion.

This should be backported up to 2.6 to help investigate H3 issues on
stable releases. Note that h3_nego_ff/h3_done_ff definition are not
available from 2.8.
This commit is contained in:
Amaury Denoyelle 2024-01-29 15:15:27 +01:00
parent 1ad1991721
commit df5cf9123f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/h3.c
View File

@ -73,6 +73,8 @@ static const struct trace_event h3_trace_events[] = {
{ .mask = H3_EV_H3C_NEW, .name = "h3c_new", .desc = "new H3 connection" }, { .mask = H3_EV_H3C_NEW, .name = "h3c_new", .desc = "new H3 connection" },
#define H3_EV_H3C_END (1ULL << 11) #define H3_EV_H3C_END (1ULL << 11)
{ .mask = H3_EV_H3C_END, .name = "h3c_end", .desc = "H3 connection terminated" }, { .mask = H3_EV_H3C_END, .name = "h3c_end", .desc = "H3 connection terminated" },
#define H3_EV_STRM_SEND (1ULL << 12)
{ .mask = H3_EV_STRM_SEND, .name = "strm_send", .desc = "sending data for stream" },
{ } { }
}; };
@ -1919,7 +1921,7 @@ static size_t h3_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count)
int32_t idx; int32_t idx;
int ret = 0; int ret = 0;
h3_debug_printf(stderr, "%s\n", __func__); TRACE_ENTER(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
htx = htx_from_buf(buf); htx = htx_from_buf(buf);
@ -2015,6 +2017,7 @@ static size_t h3_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count)
out: out:
htx_to_buf(htx, buf); htx_to_buf(htx, buf);
TRACE_LEAVE(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
return total; return total;
} }
@ -2024,7 +2027,7 @@ static size_t h3_nego_ff(struct qcs *qcs, size_t count)
int hsize; int hsize;
size_t sz, ret = 0; size_t sz, ret = 0;
h3_debug_printf(stderr, "%s\n", __func__); TRACE_ENTER(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
if (!(res = qcc_get_stream_txbuf(qcs))) { if (!(res = qcc_get_stream_txbuf(qcs))) {
qcs->sd->iobuf.flags |= IOBUF_FL_NO_FF; qcs->sd->iobuf.flags |= IOBUF_FL_NO_FF;
@ -2060,12 +2063,14 @@ static size_t h3_nego_ff(struct qcs *qcs, size_t count)
ret = count; ret = count;
end: end:
TRACE_LEAVE(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
return ret; return ret;
} }
static size_t h3_done_ff(struct qcs *qcs) static size_t h3_done_ff(struct qcs *qcs)
{ {
size_t total = qcs->sd->iobuf.data; size_t total = qcs->sd->iobuf.data;
TRACE_ENTER(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
h3_debug_printf(stderr, "%s\n", __func__); h3_debug_printf(stderr, "%s\n", __func__);
@ -2082,6 +2087,7 @@ static size_t h3_done_ff(struct qcs *qcs)
qcs->sd->iobuf.offset = 0; qcs->sd->iobuf.offset = 0;
qcs->sd->iobuf.data = 0; qcs->sd->iobuf.data = 0;
TRACE_LEAVE(H3_EV_STRM_SEND, qcs->qcc->conn, qcs);
return total; return total;
} }