MEDIUM: quic: xprt traces rework
Add a least as much as possible TRACE_ENTER() and TRACE_LEAVE() calls
to any function. Note that some functions do not have any access to the
a quic_conn argument when receiving or parsing datagram at very low level.
diff --git a/src/quic_loss.c b/src/quic_loss.c
index 2ee3efb..57a6021 100644
--- a/src/quic_loss.c
+++ b/src/quic_loss.c
@@ -17,7 +17,9 @@
unsigned int rtt, unsigned int ack_delay,
struct quic_conn *qc)
{
- TRACE_PROTO("Loss info update", QUIC_EV_CONN_RTTUPDT, qc, &rtt, &ack_delay, ql);
+ TRACE_ENTER(QUIC_EV_CONN_RTTUPDT, qc);
+ TRACE_DEVEL("Loss info update", QUIC_EV_CONN_RTTUPDT, qc, &rtt, &ack_delay, ql);
+
ql->latest_rtt = rtt;
if (!ql->rtt_min) {
/* No previous measurement. */
@@ -41,7 +43,9 @@
/* 8*srtt = 7*srtt + rtt */
ql->srtt += rtt - (ql->srtt >> 3);
}
- TRACE_PROTO("Loss info update", QUIC_EV_CONN_RTTUPDT, qc,,, ql);
+
+ TRACE_DEVEL("Loss info update", QUIC_EV_CONN_RTTUPDT, qc,,, ql);
+ TRACE_LEAVE(QUIC_EV_CONN_RTTUPDT, qc);
}
/* Returns for <qc> QUIC connection the first packet number space which
@@ -53,15 +57,19 @@
enum quic_tls_pktns i;
struct quic_pktns *pktns;
+ TRACE_ENTER(QUIC_EV_CONN_SPTO, qc);
+
pktns = &qc->pktns[QUIC_TLS_PKTNS_INITIAL];
- TRACE_PROTO("pktns", QUIC_EV_CONN_SPTO, qc, pktns);
+ TRACE_DEVEL("pktns", QUIC_EV_CONN_SPTO, qc, pktns);
for (i = QUIC_TLS_PKTNS_HANDSHAKE; i < QUIC_TLS_PKTNS_MAX; i++) {
- TRACE_PROTO("pktns", QUIC_EV_CONN_SPTO, qc, &qc->pktns[i]);
+ TRACE_DEVEL("pktns", QUIC_EV_CONN_SPTO, qc, &qc->pktns[i]);
if (!tick_isset(pktns->tx.loss_time) ||
qc->pktns[i].tx.loss_time < pktns->tx.loss_time)
pktns = &qc->pktns[i];
}
+ TRACE_LEAVE(QUIC_EV_CONN_SPTO, qc);
+
return pktns;
}
@@ -108,6 +116,7 @@
if (i == QUIC_TLS_PKTNS_01RTT) {
if (!handshake_completed) {
+ TRACE_STATE("handshake not already completed", QUIC_EV_CONN_SPTO, qc);
pktns = p;
goto out;
}
@@ -121,7 +130,7 @@
lpto = tmp_pto;
pktns = p;
}
- TRACE_PROTO("pktns", QUIC_EV_CONN_SPTO, qc, p);
+ TRACE_DEVEL("pktns", QUIC_EV_CONN_SPTO, qc, p);
}
out: