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

rename the streamFrameSorter to frameSorter

Browse source
This commit is contained in:
Marten Seemann 2018-08-26 09:52:39 +07:00
parent 53d76b6664
commit 74662e8dae
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
stream_frame_sorter.go → frame_sorter.go
View file

@ -7,7 +7,7 @@ import (
"github.com/lucas-clemente/quic-go/internal/utils"
)
type streamFrameSorter struct {
type frameSorter struct {
queue map[protocol.ByteCount][]byte
readPos protocol.ByteCount
finalOffset protocol.ByteCount
@ -16,8 +16,8 @@ type streamFrameSorter struct {
var errDuplicateStreamData = errors.New("Duplicate Stream Data")
func newStreamFrameSorter() *streamFrameSorter {
s := streamFrameSorter{
func newFrameSorter() *frameSorter {
s := frameSorter{
gaps: utils.NewByteIntervalList(),
queue: make(map[protocol.ByteCount][]byte),
finalOffset: protocol.MaxByteCount,
@ -26,7 +26,7 @@ func newStreamFrameSorter() *streamFrameSorter {
return &s
}
func (s *streamFrameSorter) Push(data []byte, offset protocol.ByteCount, fin bool) error {
func (s *frameSorter) Push(data []byte, offset protocol.ByteCount, fin bool) error {
err := s.push(data, offset, fin)
if err == errDuplicateStreamData {
return nil
@ -34,7 +34,7 @@ func (s *streamFrameSorter) Push(data []byte, offset protocol.ByteCount, fin boo
return err
}
func (s *streamFrameSorter) push(data []byte, offset protocol.ByteCount, fin bool) error {
func (s *frameSorter) push(data []byte, offset protocol.ByteCount, fin bool) error {
if fin {
s.finalOffset = offset + protocol.ByteCount(len(data))
}
@ -147,7 +147,7 @@ func (s *streamFrameSorter) push(data []byte, offset protocol.ByteCount, fin boo
return nil
}
func (s *streamFrameSorter) Pop() ([]byte /* data */, bool /* fin */) {
func (s *frameSorter) Pop() ([]byte /* data */, bool /* fin */) {
data, ok := s.queue[s.readPos]
if !ok {
return nil, s.readPos >= s.finalOffset

4
stream_frame_sorter_test.go → frame_sorter_test.go
View file

@ -10,7 +10,7 @@ import (
)
var _ = Describe("STREAM frame sorter", func() {
var s *streamFrameSorter
var s *frameSorter
checkGaps := func(expectedGaps []utils.ByteInterval) {
Expect(s.gaps.Len()).To(Equal(len(expectedGaps)))
@ -22,7 +22,7 @@ var _ = Describe("STREAM frame sorter", func() {
}
BeforeEach(func() {
s = newStreamFrameSorter()
s = newFrameSorter()
})
It("head returns nil when empty", func() {

4
receive_stream.go
View file

@ -27,7 +27,7 @@ type receiveStream struct {
sender streamSender
frameQueue *streamFrameSorter
frameQueue *frameSorter
readOffset protocol.ByteCount
currentFrame []byte
@ -63,7 +63,7 @@ func newReceiveStream(
streamID: streamID,
sender: sender,
flowController: flowController,
frameQueue: newStreamFrameSorter(),
frameQueue: newFrameSorter(),
readChan: make(chan struct{}, 1),
version: version,
}