upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-18 18:19:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

MINOR: mux-quic: define dump functions for QCC and QCS

Browse source 
Extract trace code to dump QCC and QCS instances into dedicated
functions named qmux_dump_qc{c,s}_info(). This will allow to easily
print QCC/QCS infos outside of traces.
This commit is contained in:
Amaury Denoyelle 2024-07-31 17:27:33 +02:00
parent 490cb16d3a
commit eb4dfa3b36
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/haproxy/qmux_trace.h
View file

@ -4,8 +4,12 @@
#ifdef USE_QUIC
#include <haproxy/api-t.h>
#include <haproxy/buf.h>
#include <haproxy/trace.h>
struct qcc;
struct qcs;
extern struct trace_source trace_qmux;
#define TRACE_SOURCE &trace_qmux
@ -68,6 +72,9 @@ struct qcs_build_stream_trace_arg {
uint64_t offset;
};
void qmux_dump_qcc_info(struct buffer *msg, const struct qcc *qcc);
void qmux_dump_qcs_info(struct buffer *msg, const struct qcs *qcs);
#endif /* USE_QUIC */
#endif /* _HAPROXY_QMUX_TRACE_H */

39
src/qmux_trace.c
View file

@ -72,20 +72,10 @@ static void qmux_trace(enum trace_level level, uint64_t mask,
return;
if (src->verbosity > QMUX_VERB_CLEAN) {
chunk_appendf(&trace_buf, " : qcc=%p(F)", qcc);
if (qcc->conn->handle.qc)
chunk_appendf(&trace_buf, " qc=%p", qcc->conn->handle.qc);
qmux_dump_qcc_info(&trace_buf, qcc);
chunk_appendf(&trace_buf, " md=%llu/%llu",
(ullong)qcc->tx.fc.limit, (ullong)qcc->tx.fc.off_real);
if (qcs) {
chunk_appendf(&trace_buf, " qcs=%p .id=%llu .st=%s",
qcs, (ullong)qcs->id,
qcs_st_to_str(qcs->st));
chunk_appendf(&trace_buf, " msd=%llu/%llu",
(ullong)qcs->tx.fc.limit, (ullong)qcs->tx.fc.off_real);
}
if (qcs)
qmux_dump_qcs_info(&trace_buf, qcs);
if (mask & QMUX_EV_QCC_NQCS) {
const uint64_t *id = a3;
@ -112,3 +102,26 @@ static void qmux_trace(enum trace_level level, uint64_t mask,
/* register qmux traces */
INITCALL1(STG_REGISTER, trace_register_source, TRACE_SOURCE);
void qmux_dump_qcc_info(struct buffer *msg, const struct qcc *qcc)
{
chunk_appendf(msg, " qcc=%p(F)", qcc);
if (qcc->conn->handle.qc)
chunk_appendf(msg, " qc=%p", qcc->conn->handle.qc);
chunk_appendf(msg, " .sc=%llu .hreq=%llu .flg=0x%04x", (ullong)qcc->nb_sc, (ullong)qcc->nb_hreq, qcc->flags);
chunk_appendf(msg, " .tx=%llu %llu/%llu", (ullong)qcc->tx.fc.off_soft,
(ullong)qcc->tx.fc.off_real,
(ullong)qcc->tx.fc.limit);
}
void qmux_dump_qcs_info(struct buffer *msg, const struct qcs *qcs)
{
chunk_appendf(msg, " qcs=%p .id=%llu .st=%s .flg=0x%04x", qcs, (ullong)qcs->id,
qcs_st_to_str(qcs->st), qcs->flags);
chunk_appendf(msg, " .rx=%llu/%llu", (ullong)qcs->rx.offset_max, (ullong)qcs->rx.msd);
chunk_appendf(msg, " .tx=%llu %llu/%llu", (ullong)qcs->tx.fc.off_soft,
(ullong)qcs->tx.fc.off_real,
(ullong)qcs->tx.fc.limit);
}