Merge branch 'bsi-pending-requests' into te

pending-requests.go

@@ -1,33 +1,50 @@
 package torrent
 
+import (
+	rbm "github.com/RoaringBitmap/roaring"
+	roaring "github.com/RoaringBitmap/roaring/BitSliceIndexing"
+)
+
 type pendingRequests struct {
-	m []int
+	m *roaring.BSI
 }
 
 func (p *pendingRequests) Dec(r RequestIndex) {
-	prev := p.m[r]
+	_r := uint64(r)
+	prev, _ := p.m.GetValue(_r)
 	if prev <= 0 {
 		panic(prev)
 	}
-	p.m[r]--
+	p.m.SetValue(_r, prev-1)
 }
 
 func (p *pendingRequests) Inc(r RequestIndex) {
-	p.m[r]++
+	_r := uint64(r)
+	prev, _ := p.m.GetValue(_r)
+	p.m.SetValue(_r, prev+1)
 }
 
 func (p *pendingRequests) Init(maxIndex RequestIndex) {
-	p.m = make([]int, maxIndex)
+	p.m = roaring.NewDefaultBSI()
+}
+
+var allBits rbm.Bitmap
+
+func init() {
+	allBits.AddRange(0, rbm.MaxRange)
 }
 
 func (p *pendingRequests) AssertEmpty() {
-	for _, count := range p.m {
-		if count != 0 {
-			panic(count)
-		}
+	if p.m == nil {
+		panic(p.m)
+	}
+	sum, _ := p.m.Sum(&allBits)
+	if sum != 0 {
+		panic(sum)
 	}
 }
 
 func (p *pendingRequests) Get(r RequestIndex) int {
-	return p.m[r]
+	count, _ := p.m.GetValue(uint64(r))
+	return int(count)
 }

pending-requests_test.go

@@ -1,19 +1,12 @@
 package torrent
 
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-	"github.com/google/go-cmp/cmp"
-)
-
-// Ensure that cmp.Diff will detect errors as required.
-func TestPendingRequestsDiff(t *testing.T) {
-	var a, b pendingRequests
-	c := qt.New(t)
-	diff := func() string { return cmp.Diff(a.m, b.m) }
-	c.Check(diff(), qt.ContentEquals, "")
-	a.m = []int{1, 3}
-	b.m = []int{1, 2, 3}
-	c.Check(diff(), qt.Not(qt.Equals), "")
-}
+// // Ensure that cmp.Diff will detect errors as required.
+// func TestPendingRequestsDiff(t *testing.T) {
+// 	var a, b pendingRequests
+// 	c := qt.New(t)
+// 	diff := func() string { return cmp.Diff(a.m, b.m) }
+// 	c.Check(diff(), qt.ContentEquals, "")
+// 	a.m = []int{1, 3}
+// 	b.m = []int{1, 2, 3}
+// 	c.Check(diff(), qt.Not(qt.Equals), "")
+// }

torrent.go

@@ -28,7 +28,6 @@ import (
 	"github.com/anacrolix/multiless"
 	"github.com/anacrolix/sync"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/google/go-cmp/cmp"
 	"github.com/pion/datachannel"
 
 	"github.com/anacrolix/torrent/bencode"
@@ -1381,20 +1380,20 @@ func (t *Torrent) assertPendingRequests() {
 	if !check {
 		return
 	}
-	var actual pendingRequests
-	if t.haveInfo() {
-		actual.m = make([]int, t.numRequests())
-	}
-	t.iterPeers(func(p *Peer) {
-		p.actualRequestState.Requests.Iterate(func(x uint32) bool {
-			actual.Inc(x)
-			return true
-		})
-	})
-	diff := cmp.Diff(actual.m, t.pendingRequests.m)
-	if diff != "" {
-		panic(diff)
-	}
+	// var actual pendingRequests
+	// if t.haveInfo() {
+	// 	actual.m = make([]int, t.numRequests())
+	// }
+	// t.iterPeers(func(p *Peer) {
+	// 	p.actualRequestState.Requests.Iterate(func(x uint32) bool {
+	// 		actual.Inc(x)
+	// 		return true
+	// 	})
+	// })
+	// diff := cmp.Diff(actual.m, t.pendingRequests.m)
+	// if diff != "" {
+	// 	panic(diff)
+	// }
 }
 
 func (t *Torrent) dropConnection(c *PeerConn) {