]> Sergey Matveev's repositories - btrtrc.git/commitdiff
Use intermediate t in Peer.getDesiredRequestState
authorMatt Joiner <anacrolix@gmail.com>
Wed, 11 May 2022 04:14:25 +0000 (14:14 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Thu, 12 May 2022 00:37:36 +0000 (10:37 +1000)
requesting.go

index ece5dc398797cd92bc6956084299e6711443c2a3..3c204b843cb5e6ec0431e219f01076874243079e 100644 (file)
@@ -184,22 +184,23 @@ type desiredRequestState struct {
 }
 
 func (p *Peer) getDesiredRequestState() (desired desiredRequestState) {
-       if !p.t.haveInfo() {
+       t := p.t
+       if !t.haveInfo() {
                return
        }
-       if p.t.closed.IsSet() {
+       if t.closed.IsSet() {
                return
        }
-       input := p.t.getRequestStrategyInput()
+       input := t.getRequestStrategyInput()
        requestHeap := desiredPeerRequests{
                peer:        p,
                pieceStates: make(map[pieceIndex]request_strategy.PieceRequestOrderState),
        }
        request_strategy.GetRequestablePieces(
                input,
-               p.t.getPieceRequestOrder(),
+               t.getPieceRequestOrder(),
                func(ih InfoHash, pieceIndex int, pieceExtra request_strategy.PieceRequestOrderState) {
-                       if ih != p.t.infoHash {
+                       if ih != t.infoHash {
                                return
                        }
                        if !p.peerHasPiece(pieceIndex) {
@@ -231,7 +232,7 @@ func (p *Peer) getDesiredRequestState() (desired desiredRequestState) {
                        })
                },
        )
-       p.t.assertPendingRequests()
+       t.assertPendingRequests()
        desired.Requests = requestHeap
        return
 }