From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 10 Dec 2021 07:04:45 +0000 (+1100)
Subject: Add Torrent-level request cancel for consistency
X-Git-Tag: v1.39.0^2~6
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=ddf41fc2f138de27d4ed9293028d12ba6fc4670a;p=btrtrc.git

Add Torrent-level request cancel for consistency
---

diff --git a/peerconn.go b/peerconn.go
index 4f43d50d..f36da1c0 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -1550,8 +1550,10 @@ func (c *Peer) deleteRequest(r RequestIndex) bool {
 		f(PeerRequestEvent{c, c.t.requestIndexToRequest(r)})
 	}
 	c.updateExpectingChunks()
-	delete(c.t.pendingRequests, r)
-	delete(c.t.lastRequested, r)
+	if c.t.requestingPeer(r) == c {
+		delete(c.t.pendingRequests, r)
+		delete(c.t.lastRequested, r)
+	}
 	return true
 }
 
@@ -1694,6 +1696,10 @@ func (pc *PeerConn) isLowOnRequests() bool {
 	return pc.actualRequestState.Requests.IsEmpty()
 }
 
+func (p *Peer) uncancelledRequests() uint64 {
+	return p.actualRequestState.Requests.GetCardinality() - p.cancelledRequests.GetCardinality()
+}
+
 func (pc *PeerConn) remoteIsTransmission() bool {
 	return bytes.HasPrefix(pc.PeerID[:], []byte("-TR")) && pc.PeerID[7] == '-'
 }
diff --git a/requesting.go b/requesting.go
index 50771025..f3cd8680 100644
--- a/requesting.go
+++ b/requesting.go
@@ -211,6 +211,7 @@ func (p *Peer) applyRequestState(next desiredRequestState) bool {
 	}
 	more := true
 	requestHeap := &next.Requests
+	t := p.t
 	heap.Init(requestHeap)
 	for requestHeap.Len() != 0 && maxRequests(current.Requests.GetCardinality()) < p.nominalMaxRequests() {
 		req := heap.Pop(requestHeap).(RequestIndex)
@@ -219,9 +220,9 @@ func (p *Peer) applyRequestState(next desiredRequestState) bool {
 			// requests, so we can skip this one with no additional consideration.
 			continue
 		}
-		existing := p.t.pendingRequests[req]
-		if existing != nil && existing != p && existing.actualRequestState.Requests.GetCardinality()-existing.cancelledRequests.GetCardinality() > current.Requests.GetCardinality() {
-			existing.cancel(req)
+		existing := t.requestingPeer(req)
+		if existing != nil && existing != p && existing.uncancelledRequests() > current.Requests.GetCardinality() {
+			t.cancelRequest(req)
 		}
 		more = p.mustRequest(req)
 		if !more {
diff --git a/torrent.go b/torrent.go
index b2688994..db24603b 100644
--- a/torrent.go
+++ b/torrent.go
@@ -2310,3 +2310,16 @@ func (t *Torrent) pieceRequestIndexOffset(piece pieceIndex) RequestIndex {
 func (t *Torrent) updateComplete() {
 	t.Complete.SetBool(t.haveAllPieces())
 }
+
+func (t *Torrent) cancelRequest(r RequestIndex) *Peer {
+	p := t.pendingRequests[r]
+	if p != nil {
+		p.cancel(r)
+	}
+	delete(t.pendingRequests, r)
+	return p
+}
+
+func (t *Torrent) requestingPeer(r RequestIndex) *Peer {
+	return t.pendingRequests[r]
+}