Abstract the pendingPieces as a bitmap

diff --git a/client.go b/client.go
index 27b3593a229fd04601373356fef35e07dec6ea60..c4ea5bd32430df779718782f5a7f93968145b43c 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1675,8 +1675,8 @@ func (t *torrent) needData() bool {
        if !t.haveInfo() {
                return true
        }
-       for i := range t.pendingPieces {
-               if t.wantPiece(i) {
+       for i := t.pendingPieces.Iter(); i.Next(); {
+               if t.wantPiece(i.Value()) {
                        return true
                }
        }
@@ -2476,7 +2476,7 @@ func (me *Client) pieceHashed(t *torrent, piece int, correct bool) {
 }
 
 func (me *Client) onCompletedPiece(t *torrent, piece int) {
-       delete(t.pendingPieces, piece)
+       t.pendingPieces.Remove(piece)
        for _, conn := range t.Conns {
                conn.Have(piece)
                for r := range conn.Requests {

diff --git a/connection.go b/connection.go
index cfa0fe04c34c6ccacd8364b79d7ff89e9f91299e..f4fa461aa0e5af2b3aa8e4cdd1b746e2056dc559 100644 (file)
--- a/connection.go
+++ b/connection.go
@@ -572,7 +572,8 @@ func (c *connection) fillRequests() {
                }
                return true
        })
-       for i := range c.t.pendingPieces {
+       for it := c.t.pendingPieces.Iter(); it.Next(); {
+               i := it.Value()
                if !c.t.wantPiece(i) {
                        continue
                }

diff --git a/torrent.go b/torrent.go
index bb2aa78d27a1cdda4affa14f79ea44e592bfe2e6..dcd78b8204347256a11615b20dff8124e8ef2fd3 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -12,6 +12,7 @@ import (
        "time"
 
        "github.com/anacrolix/missinggo"
+       "github.com/anacrolix/missinggo/bitmap"
        "github.com/anacrolix/missinggo/perf"
        "github.com/anacrolix/missinggo/pubsub"
        "github.com/bradfitz/iter"
@@ -98,7 +99,7 @@ type torrent struct {
 
        readers map[*Reader]struct{}
 
-       pendingPieces map[int]struct{}
+       pendingPieces *bitmap.Bitmap
 }
 
 var (
@@ -737,7 +738,7 @@ func (t *torrent) wantPiece(index int) bool {
        if t.pieceComplete(index) {
                return false
        }
-       if _, ok := t.pendingPieces[index]; ok {
+       if t.pendingPieces.Contains(index) {
                return true
        }
        return !t.forReaderOffsetPieces(func(begin, end int) bool {
@@ -757,8 +758,8 @@ func (t *torrent) forNeededPieces(f func(piece int) (more bool)) (all bool) {
 }
 
 func (t *torrent) connHasWantedPieces(c *connection) bool {
-       for i := range t.pendingPieces {
-               if c.PeerHasPiece(i) {
+       for it := t.pendingPieces.Iter(); it.Next(); {
+               if c.PeerHasPiece(it.Value()) {
                        return true
                }
        }
@@ -890,7 +891,7 @@ func (t *torrent) piecePriority(piece int) (ret piecePriority) {
        if t.pieceComplete(piece) {
                return
        }
-       if _, ok := t.pendingPieces[piece]; ok {
+       if t.pendingPieces.Contains(piece) {
                ret = PiecePriorityNormal
        }
        raiseRet := func(prio piecePriority) {
@@ -912,15 +913,15 @@ func (t *torrent) piecePriority(piece int) (ret piecePriority) {
 
 func (t *torrent) pendPiece(piece int, cl *Client) {
        if t.pendingPieces == nil {
-               t.pendingPieces = make(map[int]struct{}, t.Info.NumPieces())
+               t.pendingPieces = bitmap.New()
        }
-       if _, ok := t.pendingPieces[piece]; ok {
+       if t.pendingPieces.Contains(piece) {
                return
        }
        if t.havePiece(piece) {
                return
        }
-       t.pendingPieces[piece] = struct{}{}
+       t.pendingPieces.Add(piece)
        for _, c := range t.Conns {
                if !c.PeerHasPiece(piece) {
                        continue