Optimize request updates due to conn and reader state changes

diff --git a/peerconn.go b/peerconn.go
index 902b53ccd9865edbe83f751174e7291375b05d53..a387e1e6b2589e6d7a127919b7437f5c6c498c09 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -274,7 +274,7 @@ func (cn *PeerConn) onGotInfo(info *metainfo.Info) {
 // receiving badly sized BITFIELD, or invalid HAVE messages.
 func (cn *PeerConn) setNumPieces(num pieceIndex) {
        cn._peerPieces.RemoveRange(bitmap.BitRange(num), bitmap.ToEnd)
-       cn.peerPiecesChanged("got info")
+       cn.peerPiecesChanged()
 }
 
 func eventAgeString(t time.Time) string {
@@ -685,8 +685,7 @@ func iterBitmapsDistinct(skip *bitmap.Bitmap, bms ...bitmap.Bitmap) iter.Func {
        }
 }
 
-func (cn *Peer) peerPiecesChanged(reason string) {
-       cn.updateRequests(reason)
+func (cn *Peer) peerPiecesChanged() {
        cn.t.maybeDropMutuallyCompletePeer(cn)
 }
 
@@ -708,7 +707,10 @@ func (cn *PeerConn) peerSentHave(piece pieceIndex) error {
                cn.t.incPieceAvailability(piece)
        }
        cn._peerPieces.Add(uint32(piece))
-       cn.peerPiecesChanged("have")
+       if cn.t.wantPieceIndex(piece) {
+               cn.updateRequests("have")
+       }
+       cn.peerPiecesChanged()
        return nil
 }
 
@@ -737,11 +739,14 @@ func (cn *PeerConn) peerSentBitfield(bf []bool) error {
                }
                if have {
                        cn._peerPieces.Add(uint32(i))
+                       if cn.t.wantPieceIndex(i) {
+                               cn.updateRequests("bitfield")
+                       }
                } else {
                        cn._peerPieces.Remove(uint32(i))
                }
        }
-       cn.peerPiecesChanged("bitfield")
+       cn.peerPiecesChanged()
        return nil
 }
 
@@ -757,7 +762,10 @@ func (cn *Peer) onPeerHasAllPieces() {
        }
        cn.peerSentHaveAll = true
        cn._peerPieces.Clear()
-       cn.peerPiecesChanged("have all")
+       if cn.t._pendingPieces.Len() != 0 {
+               cn.updateRequests("have all")
+       }
+       cn.peerPiecesChanged()
 }
 
 func (cn *PeerConn) onPeerSentHaveAll() error {
@@ -769,7 +777,7 @@ func (cn *PeerConn) peerSentHaveNone() error {
        cn.t.decPeerPieceAvailability(&cn.Peer)
        cn._peerPieces.Clear()
        cn.peerSentHaveAll = false
-       cn.peerPiecesChanged("have none")
+       cn.peerPiecesChanged()
        return nil
 }
 

diff --git a/torrent.go b/torrent.go
index e099a10dce58e4cad9af01cb02ae404c24d62763..d5af3dad959f3a6f3552a20fe91eefa9ec896207 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -1107,6 +1107,15 @@ func (t *Torrent) maybeNewConns() {
 func (t *Torrent) piecePriorityChanged(piece pieceIndex, reason string) {
        if t._pendingPieces.Contains(piece) {
                t.iterPeers(func(c *Peer) {
+                       if c.actualRequestState.Interested {
+                               return
+                       }
+                       if c.actualRequestState.Requests.GetCardinality() != 0 {
+                               return
+                       }
+                       if !c.peerHasPiece(piece) {
+                               return
+                       }
                        c.updateRequests(reason)
                })
        }