SagerNet/sing-quic
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-quic.git synced 2025-04-04 20:37:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

hysteria: Improve pacer

Browse source
This commit is contained in:
世界 2024-04-28 12:41:34 +08:00
parent 2fdf8165ae
commit d718f1b9fd
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hysteria/congestion/pacer.go
View file

@ -1,7 +1,6 @@
package congestion package congestion
import ( import (
"math"
"time" "time"
"github.com/sagernet/quic-go/congestion" "github.com/sagernet/quic-go/congestion"
@ -9,6 +8,7 @@ import (
const ( const (
maxBurstPackets = 10 maxBurstPackets = 10
maxBurstPacingDelayMultiplier = 4
minPacingDelay = time.Millisecond minPacingDelay = time.Millisecond
) )
@ -52,7 +52,7 @@ func (p *pacer) Budget(now time.Time) congestion.ByteCount {
func (p *pacer) maxBurstSize() congestion.ByteCount { func (p *pacer) maxBurstSize() congestion.ByteCount {
return maxByteCount( return maxByteCount(
congestion.ByteCount((minPacingDelay+time.Millisecond).Nanoseconds())*p.getBandwidth()/1e9, congestion.ByteCount((maxBurstPacingDelayMultiplier*minPacingDelay).Nanoseconds())*p.getBandwidth()/1e9,
maxBurstPackets*p.maxDatagramSize, maxBurstPackets*p.maxDatagramSize,
) )
} }
@ -63,11 +63,16 @@ func (p *pacer) TimeUntilSend() time.Time {
if p.budgetAtLastSent >= p.maxDatagramSize { if p.budgetAtLastSent >= p.maxDatagramSize {
return time.Time{} return time.Time{}
} }
return p.lastSentTime.Add(maxDuration( diff := 1e9 * uint64(p.maxDatagramSize-p.budgetAtLastSent)
minPacingDelay, bw := uint64(p.getBandwidth())
time.Duration(math.Ceil(float64(p.maxDatagramSize-p.budgetAtLastSent)*1e9/ // We might need to round up this value.
float64(p.getBandwidth())))*time.Nanosecond, // Otherwise, we might have a budget (slightly) smaller than the datagram size when the timer expires.
)) d := diff / bw
// this is effectively a math.Ceil, but using only integer math
if diff%bw > 0 {
d++
}
return p.lastSentTime.Add(maxDuration(congestion.MinPacingDelay, time.Duration(d)*time.Nanosecond))
} }
func (p *pacer) SetMaxDatagramSize(s congestion.ByteCount) { func (p *pacer) SetMaxDatagramSize(s congestion.ByteCount) {