gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

qlog updated metrics when sending a packet

Browse Source
This commit is contained in:
Marten Seemann
2020-03-30 14:25:33 +07:00
parent 9182a901d5
commit 3e2c27e4cd
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/ackhandler/sent_packet_handler.go
View File

@@ -167,6 +167,17 @@ func (h *sentPacketHandler) dropPackets(encLevel protocol.EncryptionLevel) {
h.ptoMode = SendNone h.ptoMode = SendNone
} }
func (h *sentPacketHandler) packetsInFlight() int {
packetsInFlight := h.appDataPackets.history.Len()
if h.handshakePackets != nil {
packetsInFlight += h.handshakePackets.history.Len()
}
if h.initialPackets != nil {
packetsInFlight += h.initialPackets.history.Len()
}
return packetsInFlight
}
func (h *sentPacketHandler) SentPacket(packet *Packet) { func (h *sentPacketHandler) SentPacket(packet *Packet) {
// For the client, drop the Initial packet number space when the first Handshake packet is sent. // For the client, drop the Initial packet number space when the first Handshake packet is sent.
if h.perspective == protocol.PerspectiveClient && packet.EncryptionLevel == protocol.EncryptionHandshake && h.initialPackets != nil { if h.perspective == protocol.PerspectiveClient && packet.EncryptionLevel == protocol.EncryptionHandshake && h.initialPackets != nil {
@@ -176,6 +187,9 @@ func (h *sentPacketHandler) SentPacket(packet *Packet) {
if isAckEliciting { if isAckEliciting {
h.getPacketNumberSpace(packet.EncryptionLevel).history.SentPacket(packet) h.getPacketNumberSpace(packet.EncryptionLevel).history.SentPacket(packet)
} }
if h.qlogger != nil {
h.qlogger.UpdatedMetrics(h.rttStats, h.congestion.GetCongestionWindow(), h.bytesInFlight, h.packetsInFlight())
}
if isAckEliciting || !h.peerCompletedAddressValidation { if isAckEliciting || !h.peerCompletedAddressValidation {
h.setLossDetectionTimer() h.setLossDetectionTimer()
} }
@@ -256,14 +270,7 @@ func (h *sentPacketHandler) ReceivedAck(ack *wire.AckFrame, encLevel protocol.En
} }
h.congestion.MaybeExitSlowStart() h.congestion.MaybeExitSlowStart()
if h.qlogger != nil { if h.qlogger != nil {
packetsInFlight := h.appDataPackets.history.Len() h.qlogger.UpdatedMetrics(h.rttStats, h.congestion.GetCongestionWindow(), h.bytesInFlight, h.packetsInFlight())
if h.handshakePackets != nil {
packetsInFlight += h.handshakePackets.history.Len()
}
if h.initialPackets != nil {
packetsInFlight += h.initialPackets.history.Len()
}
h.qlogger.UpdatedMetrics(h.rttStats, h.congestion.GetCongestionWindow(), h.bytesInFlight, packetsInFlight)
} }
} }