From d4507d439747d3cf28f16a687e0b62b4e40ae66e Mon Sep 17 00:00:00 2001 From: Toby Date: Sun, 12 Apr 2020 14:24:14 -0700 Subject: [PATCH] quic-go upstream update & minor changes to brutal sender --- go.mod | 2 +- go.sum | 8 ++++---- pkg/congestion/brutal.go | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index da9de56..976a352 100644 --- a/go.mod +++ b/go.mod @@ -6,4 +6,4 @@ require github.com/golang/protobuf v1.3.1 require github.com/lucas-clemente/quic-go v0.15.2 -replace github.com/lucas-clemente/quic-go => github.com/tobyxdd/quic-go v0.1.2-tquic-1 +replace github.com/lucas-clemente/quic-go => github.com/tobyxdd/quic-go v0.1.3-tquic-1 diff --git a/go.sum b/go.sum index 69ed689..6571e36 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI= -github.com/marten-seemann/qtls v0.8.0 h1:aj+MPLibzKByw8CmG0WvWgbtBkctYPAXeB11cQJC8mo= -github.com/marten-seemann/qtls v0.8.0/go.mod h1:Lao6jDqlCfxyLKYFmZXGm2LSHBgVn+P+ROOex6YkT+k= +github.com/marten-seemann/qtls v0.9.0 h1:8Zguhc72eS+DH5EAb0BpAPIy3HDXYcihQi4xoDZOnjQ= +github.com/marten-seemann/qtls v0.9.0/go.mod h1:T1MmAdDPyISzxlK6kjRr0pcZFBVd1OZbBb/j3cvzHhk= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -115,8 +115,8 @@ github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/tobyxdd/quic-go v0.1.2-tquic-1 h1:PPbkQyNNlI2ZXFWDspBGvOTXAWTX/y82mVy+kDzKtgY= -github.com/tobyxdd/quic-go v0.1.2-tquic-1/go.mod h1:qxmO5Y4ZMhdNkunGfxuZnZXnJwYpW9vjQkyrZ7BsgUI= +github.com/tobyxdd/quic-go v0.1.3-tquic-1 h1:LOD8EsuNTYaDInkkgy3swL8d3y2SIliKaGlGSomvlik= +github.com/tobyxdd/quic-go v0.1.3-tquic-1/go.mod h1:oj40DjNLuNugvtXWg4PwaYgv7tAbzAabrT57CC69EhI= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= diff --git a/pkg/congestion/brutal.go b/pkg/congestion/brutal.go index 491bdd8..3d87bb4 100644 --- a/pkg/congestion/brutal.go +++ b/pkg/congestion/brutal.go @@ -34,17 +34,17 @@ func (b *BrutalSender) SetRTTStats(rttStats *congestion.RTTStats) { } func (b *BrutalSender) TimeUntilSend(bytesInFlight congestion.ByteCount) time.Duration { - return time.Duration(congestion.ByteCount(time.Second) * congestion.MaxPacketSizeIPv4 / (2 * b.bps)) + return time.Duration(congestion.MaxPacketSizeIPv4 * congestion.ByteCount(time.Second) / (2 * b.bps)) } func (b *BrutalSender) CanSend(bytesInFlight congestion.ByteCount) bool { - if b.ackRate == 0 { - return bytesInFlight < b.GetCongestionWindow() - } else if b.ackRate > 0.5 { - return bytesInFlight < congestion.ByteCount(float64(b.GetCongestionWindow())/b.ackRate) - } else { - return bytesInFlight < b.GetCongestionWindow()*2 + rate := b.ackRate + if rate <= 0 { + rate = 1 + } else if rate < 0.5 { + rate = 0.5 } + return bytesInFlight < congestion.ByteCount(float64(b.GetCongestionWindow())/rate) } func (b *BrutalSender) GetCongestionWindow() congestion.ByteCount {