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

put STREAM frames back into the pool when they are acknowledged

Browse source
This commit is contained in:
Marten Seemann 2019-09-04 20:36:45 +07:00
parent 4cfbb2f134
commit 4cb8bf3101
5 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ackhandler/frame.go
View file

@ -5,5 +5,5 @@ import "github.com/lucas-clemente/quic-go/internal/wire"
type Frame struct { type Frame struct {
wire.Frame // nil if the frame has already been acknowledged in another packet wire.Frame // nil if the frame has already been acknowledged in another packet
OnLost func(wire.Frame) OnLost func(wire.Frame)
OnAcked func() OnAcked func(wire.Frame)
} }

2
internal/ackhandler/sent_packet_handler.go
View file

@ -446,7 +446,7 @@ func (h *sentPacketHandler) onPacketAcked(p *Packet, rcvTime time.Time) error {
for _, f := range p.Frames { for _, f := range p.Frames {
if f.OnAcked != nil { if f.OnAcked != nil {
f.OnAcked() f.OnAcked(f.Frame)
} }
} }
if p.includedInBytesInFlight { if p.includedInBytesInFlight {

7
internal/ackhandler/sent_packet_handler_test.go
View file

@ -202,9 +202,14 @@ var _ = Describe("SentPacketHandler", func() {
It("calls the OnAcked callback", func() { It("calls the OnAcked callback", func() {
var acked bool var acked bool
ping := &wire.PingFrame{}
handler.SentPacket(ackElicitingPacket(&Packet{ handler.SentPacket(ackElicitingPacket(&Packet{
PacketNumber: 13, PacketNumber: 13,
Frames: []Frame{{Frame: &wire.PingFrame{}, OnAcked: func() { acked = true }}}, Frames: []Frame{{Frame: ping, OnAcked: func(f wire.Frame) {
Expect(f).To(Equal(ping))
acked = true
},
}},
})) }))
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 13, Largest: 13}}} ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 13, Largest: 13}}}
Expect(handler.ReceivedAck(ack, 1, protocol.Encryption1RTT, time.Now())).To(Succeed()) Expect(handler.ReceivedAck(ack, 1, protocol.Encryption1RTT, time.Now())).To(Succeed())

4
send_stream.go
View file

@ -270,7 +270,9 @@ func (s *sendStream) getDataForWriting(f *wire.StreamFrame, maxBytes protocol.By
f.FinBit = s.finishedWriting && s.dataForWriting == nil && !s.finSent f.FinBit = s.finishedWriting && s.dataForWriting == nil && !s.finSent
} }
func (s *sendStream) frameAcked() { func (s *sendStream) frameAcked(f wire.Frame) {
f.(*wire.StreamFrame).PutBack()
s.mutex.Lock() s.mutex.Lock()
s.numOutstandingFrames-- s.numOutstandingFrames--
if s.numOutstandingFrames < 0 { if s.numOutstandingFrames < 0 {

8
send_stream_test.go
View file

@ -786,7 +786,7 @@ var _ = Describe("Send Stream", func() {
// Acknowledge all frames. // Acknowledge all frames.
// We don't expect the stream to be completed, since we still need to send the FIN. // We don't expect the stream to be completed, since we still need to send the FIN.
for _, f := range frames { for _, f := range frames {
f.OnAcked() f.OnAcked(f.Frame)
} }
// Now close the stream and acknowledge the FIN. // Now close the stream and acknowledge the FIN.
@ -794,7 +794,7 @@ var _ = Describe("Send Stream", func() {
frame, _ := str.popStreamFrame(protocol.MaxByteCount) frame, _ := str.popStreamFrame(protocol.MaxByteCount)
Expect(frame).ToNot(BeNil()) Expect(frame).ToNot(BeNil())
mockSender.EXPECT().onStreamCompleted(streamID) mockSender.EXPECT().onStreamCompleted(streamID)
frame.OnAcked() frame.OnAcked(frame.Frame)
}) })
It("doesn't say it's completed when there are frames waiting to be retransmitted", func() { It("doesn't say it's completed when there are frames waiting to be retransmitted", func() {
@ -824,7 +824,7 @@ var _ = Describe("Send Stream", func() {
// lose the first frame, acknowledge all others // lose the first frame, acknowledge all others
for _, f := range frames[1:] { for _, f := range frames[1:] {
f.OnAcked() f.OnAcked(f.Frame)
} }
frames[0].OnLost(frames[0].Frame) frames[0].OnLost(frames[0].Frame)
@ -832,7 +832,7 @@ var _ = Describe("Send Stream", func() {
ret, _ := str.popStreamFrame(protocol.MaxByteCount) ret, _ := str.popStreamFrame(protocol.MaxByteCount)
Expect(ret).ToNot(BeNil()) Expect(ret).ToNot(BeNil())
mockSender.EXPECT().onStreamCompleted(streamID) mockSender.EXPECT().onStreamCompleted(streamID)
ret.OnAcked() ret.OnAcked(ret.Frame)
}) })
}) })
}) })