Fix out of order openNewConns causing a benchmark to fail

Author: anacrolix

request-strategy-impls_test.go

@@ -119,9 +119,11 @@ func BenchmarkRequestStrategy(b *testing.B) {
 		for completed := 0; completed <= numPieces; completed += 1 {
 			storageClient.completed = completed
 			if completed > 0 {
-				tor.cl.lock()
-				tor.updatePieceCompletion(completed - 1)
-				tor.cl.unlock()
+				func() {
+					tor.cl.lock()
+					defer tor.cl.unlock()
+					tor.updatePieceCompletion(completed - 1)
+				}()
 			}
 			// Starting and stopping timers around this part causes lots of GC overhead.
 			rs := peer.getDesiredRequestState()

torrent.go

@@ -1829,16 +1829,16 @@ func (t *Torrent) afterSetPieceCompletion(piece pieceIndex, changed bool) {
 	cmpl := p.completion()
 	complete := cmpl.Ok && cmpl.Complete
 	p.t.updatePieceRequestOrderPiece(piece)
-	if complete {
-		t.openNewConns()
-	}
 	t.deferUpdateComplete()
 	if complete && len(p.dirtiers) != 0 {
 		t.logger.Printf("marked piece %v complete but still has dirtiers", piece)
 	}
 	if changed {
 		t.pieceCompletionChanged(piece, "Torrent.updatePieceCompletion")
 	}
+	if complete {
+		t.openNewConns()
+	}
 }
 
 // Non-blocking read. Client lock is not required.