mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove streamFramer.EstimatedDataLen

Browse source 
ref #217
This commit is contained in:
Lucas Clemente 2016-07-26 10:11:23 +02:00
parent 44acb8ca82
commit 804287bd5c
2 changed files with 0 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

35
stream_framer.go
View file

@ -32,41 +32,6 @@ func (f *streamFramer) AddFrameForRetransmission(frame *frames.StreamFrame) {
f.retransmissionQueue = append(f.retransmissionQueue, frame)
}
func (f *streamFramer) EstimatedDataLen() protocol.ByteCount {
// We don't accurately calculate the len of FIN frames. Instead we estimate
// they're 5 bytes long on average, i.e. 2 bytes stream ID and 2 bytes offset.
const estimatedLenOfFinFrame = 1 + 2 + 2
var l protocol.ByteCount
const max = protocol.MaxFrameAndPublicHeaderSize
// Count retransmissions
for _, frame := range f.retransmissionQueue {
l += frame.DataLen()
if l > max {
return max
}
}
// Count data in streams
f.streamsMutex.RLock()
defer f.streamsMutex.RUnlock()
for _, s := range *f.streams {
if s != nil {
// An error should never happen, and needlessly complicates the return values
fcLimit, _ := f.getFCAllowanceForStream(s)
l += utils.MinByteCount(s.lenOfDataForWriting(), fcLimit)
if s.shouldSendFin() {
l += estimatedLenOfFinFrame
}
if l > max {
return max
}
}
}
return l
}
func (f *streamFramer) PopStreamFrames(maxLen protocol.ByteCount) []*frames.StreamFrame {
fs, currentLen := f.maybePopFramesForRetransmission(maxLen)
return append(fs, f.maybePopNormalFrames(maxLen-currentLen)...)

51
stream_framer_test.go
View file

@ -59,47 +59,6 @@ var _ = Describe("Stream Framer", func() {
Expect(fs[0].DataLenPresent).To(BeTrue())
})
Context("Framer estimated data length", func() {
It("returns the correct length for an empty framer", func() {
Expect(framer.EstimatedDataLen()).To(BeZero())
})
It("returns the correct byte length", func() {
framer.AddFrameForRetransmission(retransmittedFrame1)
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(2)))
stream1.dataForWriting = []byte("foobar")
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(2 + 6)))
})
It("returns the correct byte length when popping", func() {
framer.AddFrameForRetransmission(retransmittedFrame1)
stream1.dataForWriting = []byte("foobar")
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(2 + 6)))
framer.PopStreamFrames(8)
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(6)))
framer.PopStreamFrames(1000)
Expect(framer.EstimatedDataLen()).To(BeZero())
})
It("includes estimated FIN frames", func() {
stream1.closed = 1
// estimate for an average frame containing only a FIN bit
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(5)))
})
It("is zero when FC blocked", func() {
stream1.dataForWriting = []byte("foobar")
Expect(framer.EstimatedDataLen()).To(Equal(protocol.ByteCount(6)))
fcm.sendWindowSizes[stream1.StreamID()] = 0
Expect(framer.EstimatedDataLen()).To(BeZero())
})
It("caps the length", func() {
stream1.dataForWriting = bytes.Repeat([]byte{'a'}, int(protocol.MaxPacketSize)+10)
Expect(framer.EstimatedDataLen()).To(Equal(protocol.MaxFrameAndPublicHeaderSize))
})
})
Context("Popping", func() {
It("returns nil when popping an empty framer", func() {
Expect(framer.PopStreamFrames(1000)).To(BeEmpty())
@ -218,16 +177,6 @@ var _ = Describe("Stream Framer", func() {
Expect(fs).To(HaveLen(1))
Expect(fs[0].Data).To(Equal([]byte("bar")))
})
It("correctly calculates the byte length when returning a split frame", func() {
framer.AddFrameForRetransmission(retransmittedFrame1)
framer.AddFrameForRetransmission(retransmittedFrame2)
startByteLength := framer.EstimatedDataLen()
fs := framer.PopStreamFrames(6)
Expect(fs).To(HaveLen(1))
Expect(fs[0].StreamID).To(Equal(retransmittedFrame1.StreamID)) // make sure the right frame was popped
Expect(framer.EstimatedDataLen()).To(Equal(startByteLength - fs[0].DataLen()))
})
})
Context("sending FINs", func() {