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

introduce invalid stream ID to simplify the outgoing streams map

Browse source
This commit is contained in:
Marten Seemann 2019-05-30 03:16:45 +08:00
parent 5009f1cb19
commit 82acc7f2b7
6 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/protocol/stream_id.go
View file

@ -1,7 +1,11 @@
package protocol
// A StreamID in QUIC
type StreamID uint64
type StreamID int64
// InvalidPacketNumber is a stream ID that is invalid.
// The first valid stream ID in QUIC is 0.
const InvalidStreamID = -1
// StreamType encodes if this is a unidirectional or bidirectional stream
type StreamType uint8

4
internal/protocol/stream_id_test.go
View file

@ -6,6 +6,10 @@ import (
)
var _ = Describe("Stream ID", func() {
It("InvalidStreamID is smaller than all valid stream IDs", func() {
Expect(InvalidStreamID).To(BeNumerically("<", 0))
})
It("says who initiated a stream", func() {
Expect(StreamID(4).InitiatedBy()).To(Equal(PerspectiveClient))
Expect(StreamID(5).InitiatedBy()).To(Equal(PerspectiveServer))

4
internal/wire/log_test.go
View file

@ -38,12 +38,12 @@ var _ = Describe("Frame logging", func() {
It("logs sent frames", func() {
LogFrame(logger, &ResetStreamFrame{}, true)
Expect(buf.Bytes()).To(ContainSubstring("\t-> &wire.ResetStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
Expect(buf.Bytes()).To(ContainSubstring("\t-> &wire.ResetStreamFrame{StreamID:0, ErrorCode:0x0, ByteOffset:0x0}\n"))
})
It("logs received frames", func() {
LogFrame(logger, &ResetStreamFrame{}, false)
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.ResetStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.ResetStreamFrame{StreamID:0, ErrorCode:0x0, ByteOffset:0x0}\n"))
})
It("logs CRYPTO frames", func() {

15
streams_map_outgoing_bidi.go
View file

@ -19,10 +19,9 @@ type outgoingBidiStreamsMap struct {
streams map[protocol.StreamID]streamI
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
maxStreamSet bool // was maxStream set. If not, it's not possible to any stream (also works for stream 0)
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
newStream func(protocol.StreamID) streamI
queueStreamIDBlocked func(*wire.StreamsBlockedFrame)
@ -38,6 +37,7 @@ func newOutgoingBidiStreamsMap(
m := &outgoingBidiStreamsMap{
streams: make(map[protocol.StreamID]streamI),
nextStream: nextStream,
maxStream: protocol.InvalidStreamID,
newStream: newStream,
queueStreamIDBlocked: func(f *wire.StreamsBlockedFrame) { queueControlFrame(f) },
}
@ -80,9 +80,9 @@ func (m *outgoingBidiStreamsMap) OpenStreamSync() (streamI, error) {
}
func (m *outgoingBidiStreamsMap) openStreamImpl() (streamI, error) {
if !m.maxStreamSet || m.nextStream > m.maxStream {
if m.nextStream > m.maxStream {
if !m.blockedSent {
if m.maxStreamSet {
if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeBidi,
StreamLimit: m.maxStream.StreamNum(),
@ -127,9 +127,8 @@ func (m *outgoingBidiStreamsMap) DeleteStream(id protocol.StreamID) error {
func (m *outgoingBidiStreamsMap) SetMaxStream(id protocol.StreamID) {
m.mutex.Lock()
if !m.maxStreamSet || id > m.maxStream {
if id > m.maxStream {
m.maxStream = id
m.maxStreamSet = true
m.blockedSent = false
m.cond.Broadcast()
}

15
streams_map_outgoing_generic.go
View file

@ -17,10 +17,9 @@ type outgoingItemsMap struct {
streams map[protocol.StreamID]item
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
maxStreamSet bool // was maxStream set. If not, it's not possible to any stream (also works for stream 0)
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
newStream func(protocol.StreamID) item
queueStreamIDBlocked func(*wire.StreamsBlockedFrame)
@ -36,6 +35,7 @@ func newOutgoingItemsMap(
m := &outgoingItemsMap{
streams: make(map[protocol.StreamID]item),
nextStream: nextStream,
maxStream: protocol.InvalidStreamID,
newStream: newStream,
queueStreamIDBlocked: func(f *wire.StreamsBlockedFrame) { queueControlFrame(f) },
}
@ -78,9 +78,9 @@ func (m *outgoingItemsMap) OpenStreamSync() (item, error) {
}
func (m *outgoingItemsMap) openStreamImpl() (item, error) {
if !m.maxStreamSet || m.nextStream > m.maxStream {
if m.nextStream > m.maxStream {
if !m.blockedSent {
if m.maxStreamSet {
if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: streamTypeGeneric,
StreamLimit: m.maxStream.StreamNum(),
@ -125,9 +125,8 @@ func (m *outgoingItemsMap) DeleteStream(id protocol.StreamID) error {
func (m *outgoingItemsMap) SetMaxStream(id protocol.StreamID) {
m.mutex.Lock()
if !m.maxStreamSet || id > m.maxStream {
if id > m.maxStream {
m.maxStream = id
m.maxStreamSet = true
m.blockedSent = false
m.cond.Broadcast()
}

15
streams_map_outgoing_uni.go
View file

@ -19,10 +19,9 @@ type outgoingUniStreamsMap struct {
streams map[protocol.StreamID]sendStreamI
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
maxStreamSet bool // was maxStream set. If not, it's not possible to any stream (also works for stream 0)
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
nextStream protocol.StreamID // stream ID of the stream returned by OpenStream(Sync)
maxStream protocol.StreamID // the maximum stream ID we're allowed to open
blockedSent bool // was a STREAMS_BLOCKED sent for the current maxStream
newStream func(protocol.StreamID) sendStreamI
queueStreamIDBlocked func(*wire.StreamsBlockedFrame)
@ -38,6 +37,7 @@ func newOutgoingUniStreamsMap(
m := &outgoingUniStreamsMap{
streams: make(map[protocol.StreamID]sendStreamI),
nextStream: nextStream,
maxStream: protocol.InvalidStreamID,
newStream: newStream,
queueStreamIDBlocked: func(f *wire.StreamsBlockedFrame) { queueControlFrame(f) },
}
@ -80,9 +80,9 @@ func (m *outgoingUniStreamsMap) OpenStreamSync() (sendStreamI, error) {
}
func (m *outgoingUniStreamsMap) openStreamImpl() (sendStreamI, error) {
if !m.maxStreamSet || m.nextStream > m.maxStream {
if m.nextStream > m.maxStream {
if !m.blockedSent {
if m.maxStreamSet {
if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeUni,
StreamLimit: m.maxStream.StreamNum(),
@ -127,9 +127,8 @@ func (m *outgoingUniStreamsMap) DeleteStream(id protocol.StreamID) error {
func (m *outgoingUniStreamsMap) SetMaxStream(id protocol.StreamID) {
m.mutex.Lock()
if !m.maxStreamSet || id > m.maxStream {
if id > m.maxStream {
m.maxStream = id
m.maxStreamSet = true
m.blockedSent = false
m.cond.Broadcast()
}