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

Merge pull request #1309 from lucas-clemente/ack-binary-search

Browse Source 
use binary search to check if an ACK acks a packet
This commit is contained in:
Marten Seemann
2018-04-19 18:01:33 +09:00
committed by GitHub
parent ea055deea2 1ec873f917
commit c723339f4d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/wire/ack_frame.go
View File

@@ -3,6 +3,7 @@ package wire
import ( import (
"bytes" "bytes"
"errors" "errors"
"sort"
"time" "time"
"github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/protocol"
@@ -202,17 +203,15 @@ func (f *AckFrame) LowestAcked() protocol.PacketNumber {
// AcksPacket determines if this ACK frame acks a certain packet number // AcksPacket determines if this ACK frame acks a certain packet number
func (f *AckFrame) AcksPacket(p protocol.PacketNumber) bool { func (f *AckFrame) AcksPacket(p protocol.PacketNumber) bool {
if p < f.LowestAcked() || p > f.LargestAcked() { // this is just a performance optimization if p < f.LowestAcked() || p > f.LargestAcked() {
return false return false
} }
// TODO: this could be implemented as a binary search i := sort.Search(len(f.AckRanges), func(i int) bool {
for _, ackRange := range f.AckRanges { return p >= f.AckRanges[i].Smallest
if p >= ackRange.Smallest && p <= ackRange.Largest { })
return true // i will always be < len(f.AckRanges), since we checked above that p is not bigger than the largest acked
} return p <= f.AckRanges[i].Largest
}
return false
} }
func encodeAckDelay(delay time.Duration) uint64 { func encodeAckDelay(delay time.Duration) uint64 {

2
internal/wire/ack_frame_test.go
View File

@@ -314,12 +314,14 @@ var _ = Describe("ACK Frame (for IETF QUIC)", func() {
} }
Expect(f.AcksPacket(4)).To(BeFalse()) Expect(f.AcksPacket(4)).To(BeFalse())
Expect(f.AcksPacket(5)).To(BeTrue()) Expect(f.AcksPacket(5)).To(BeTrue())
Expect(f.AcksPacket(6)).To(BeTrue())
Expect(f.AcksPacket(7)).To(BeTrue()) Expect(f.AcksPacket(7)).To(BeTrue())
Expect(f.AcksPacket(8)).To(BeTrue()) Expect(f.AcksPacket(8)).To(BeTrue())
Expect(f.AcksPacket(9)).To(BeFalse()) Expect(f.AcksPacket(9)).To(BeFalse())
Expect(f.AcksPacket(14)).To(BeFalse()) Expect(f.AcksPacket(14)).To(BeFalse())
Expect(f.AcksPacket(15)).To(BeTrue()) Expect(f.AcksPacket(15)).To(BeTrue())
Expect(f.AcksPacket(18)).To(BeTrue()) Expect(f.AcksPacket(18)).To(BeTrue())
Expect(f.AcksPacket(19)).To(BeTrue())
Expect(f.AcksPacket(20)).To(BeTrue()) Expect(f.AcksPacket(20)).To(BeTrue())
Expect(f.AcksPacket(21)).To(BeFalse()) Expect(f.AcksPacket(21)).To(BeFalse())
}) })