mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: various tweaks

Browse source
This commit is contained in:
Toby 2024-05-19 11:46:52 -07:00
parent 5b0ab76d44
commit cd512ce1c6
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/internal/congestion/bbr/bbr_sender.go
View file

@ -340,8 +340,6 @@ func (b *bbrSender) OnPacketSent(
} }
b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, isRetransmittable) b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, isRetransmittable)
b.maybeAppLimited(bytesInFlight)
} }
// CanSend implements the SendAlgorithm interface. // CanSend implements the SendAlgorithm interface.
@ -421,6 +419,8 @@ func (b *bbrSender) OnCongestionEventEx(priorInFlight congestion.ByteCount, even
// packet in lost_packets. // packet in lost_packets.
var lastPacketSendState sendTimeState var lastPacketSendState sendTimeState
b.maybeAppLimited(priorInFlight)
// Update bytesInFlight // Update bytesInFlight
b.bytesInFlight = priorInFlight b.bytesInFlight = priorInFlight
for _, p := range ackedPackets { for _, p := range ackedPackets {
@ -716,16 +716,12 @@ func (b *bbrSender) checkIfFullBandwidthReached(lastPacketSendState *sendTimeSta
func (b *bbrSender) maybeAppLimited(bytesInFlight congestion.ByteCount) { func (b *bbrSender) maybeAppLimited(bytesInFlight congestion.ByteCount) {
congestionWindow := b.GetCongestionWindow() congestionWindow := b.GetCongestionWindow()
if bytesInFlight >= congestionWindow { // HACK: consider it app-limited if bytes in flight is less than 90% of the congestion window.
if bytesInFlight >= congestionWindow*9/10 ||
(b.mode == bbrModeDrain && bytesInFlight > congestionWindow/2) {
return return
} }
availableBytes := congestionWindow - bytesInFlight b.sampler.OnAppLimited()
if availableBytes > maxBbrBurstPackets*b.maxDatagramSize {
b.sampler.OnAppLimited()
if b.debug {
b.debugPrint("AppLimited, AvailableBytes: %d", availableBytes)
}
}
} }
// Transitions from STARTUP to DRAIN and from DRAIN to PROBE_BW if // Transitions from STARTUP to DRAIN and from DRAIN to PROBE_BW if
@ -782,6 +778,9 @@ func (b *bbrSender) maybeEnterOrExitProbeRtt(now time.Time, isRoundStart, minRtt
} }
if now.Sub(b.exitProbeRttAt) >= 0 && b.probeRttRoundPassed { if now.Sub(b.exitProbeRttAt) >= 0 && b.probeRttRoundPassed {
b.minRttTimestamp = now b.minRttTimestamp = now
if b.debug {
b.debugPrint("MinRTT: %s", b.getMinRtt())
}
if !b.isAtFullBandwidth { if !b.isAtFullBandwidth {
b.enterStartupMode(now) b.enterStartupMode(now)
} else { } else {