gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

move tracking of the final stream offset to the stream

Browse Source
This commit is contained in:
Marten Seemann
2019-01-22 21:02:41 +07:00
parent 9888db457f
commit 1864e301ef
4 changed files with 90 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frame_sorter.go
View File

@@ -8,36 +8,31 @@ import (
)
type frameSorter struct {
queue map[protocol.ByteCount][]byte
readPos protocol.ByteCount
finalOffset protocol.ByteCount
gaps *utils.ByteIntervalList
queue map[protocol.ByteCount][]byte
readPos protocol.ByteCount
gaps *utils.ByteIntervalList
}
var errDuplicateStreamData = errors.New("Duplicate Stream Data")
func newFrameSorter() *frameSorter {
s := frameSorter{
gaps: utils.NewByteIntervalList(),
queue: make(map[protocol.ByteCount][]byte),
finalOffset: protocol.MaxByteCount,
gaps: utils.NewByteIntervalList(),
queue: make(map[protocol.ByteCount][]byte),
}
s.gaps.PushFront(utils.ByteInterval{Start: 0, End: protocol.MaxByteCount})
return &s
}
func (s *frameSorter) Push(data []byte, offset protocol.ByteCount, fin bool) error {
err := s.push(data, offset, fin)
func (s *frameSorter) Push(data []byte, offset protocol.ByteCount) error {
err := s.push(data, offset)
if err == errDuplicateStreamData {
return nil
}
return err
}
func (s *frameSorter) push(data []byte, offset protocol.ByteCount, fin bool) error {
if fin {
s.finalOffset = offset + protocol.ByteCount(len(data))
}
func (s *frameSorter) push(data []byte, offset protocol.ByteCount) error {
if len(data) == 0 {
return nil
}
@@ -147,14 +142,15 @@ func (s *frameSorter) push(data []byte, offset protocol.ByteCount, fin bool) err
return nil
}
func (s *frameSorter) Pop() ([]byte /* data */, bool /* fin */) {
func (s *frameSorter) Pop() (protocol.ByteCount, []byte) {
data, ok := s.queue[s.readPos]
if !ok {
return nil, s.readPos >= s.finalOffset
return s.readPos, nil
}
delete(s.queue, s.readPos)
offset := s.readPos
s.readPos += protocol.ByteCount(len(data))
return data, s.readPos >= s.finalOffset
return offset, data
}
// HasMoreData says if there is any more data queued at *any* offset.