xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: BBR memory leak

Browse source 
from: 7c46e845a6
This commit is contained in:
gVisor bot 2023-10-11 11:01:17 +08:00
parent 7f1769d162
commit 934b13414e
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
transport/tuic/congestion_v2/bbr_sender.go
View file

@ -484,10 +484,19 @@ func (b *bbrSender) OnCongestionEventEx(priorInFlight congestion.ByteCount, even
b.calculateRecoveryWindow(bytesAcked, bytesLost) b.calculateRecoveryWindow(bytesAcked, bytesLost)
// Cleanup internal state. // Cleanup internal state.
if len(lostPackets) != 0 { // This is where we clean up obsolete (acked or lost) packets from the bandwidth sampler.
lastLostPacket := lostPackets[len(lostPackets)-1].PacketNumber // The "least unacked" should actually be FirstOutstanding, but since we are not passing
b.sampler.RemoveObsoletePackets(lastLostPacket) // that through OnCongestionEventEx, we will only do an estimate using acked/lost packets
// for now. Because of fast retransmission, they should differ by no more than 2 packets.
// (this is controlled by packetThreshold in quic-go's sentPacketHandler)
var leastUnacked congestion.PacketNumber
if len(ackedPackets) != 0 {
leastUnacked = ackedPackets[len(ackedPackets)-1].PacketNumber - 2
} else {
leastUnacked = lostPackets[len(lostPackets)-1].PacketNumber + 1
} }
b.sampler.RemoveObsoletePackets(leastUnacked)
if isRoundStart { if isRoundStart {
b.numLossEventsInRound = 0 b.numLossEventsInRound = 0
b.bytesLostInRound = 0 b.bytesLostInRound = 0