dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore pieces for request after accounting for storage

This commit is contained in:
Matt Joiner 2021-05-10 17:03:56 +10:00
parent b508877d82
commit 6d25c99ac6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
request-strategy.go
View File

@ -31,6 +31,10 @@ func (me *clientPieceRequestOrder) addPieces(t *Torrent, numPieces pieceIndex) {
} }
} }
func (me *clientPieceRequestOrder) Len() int {
return len(me.pieces)
}
func (me *clientPieceRequestOrder) removePieces(t *Torrent) { func (me *clientPieceRequestOrder) removePieces(t *Torrent) {
newPieces := make([]pieceRequestOrderPiece, 0, len(me.pieces)-t.numPieces()) newPieces := make([]pieceRequestOrderPiece, 0, len(me.pieces)-t.numPieces())
for _, p := range me.pieces { for _, p := range me.pieces {
@ -118,9 +122,6 @@ func (cl *Client) doRequests() {
// For a given piece, the set of allPeers indices that absorbed requests for the piece. // For a given piece, the set of allPeers indices that absorbed requests for the piece.
contributed := make(map[int]struct{}) contributed := make(map[int]struct{})
for _, p := range requestOrder.pieces { for _, p := range requestOrder.pieces {
if p.t.ignorePieceForRequests(p.index) {
continue
}
peers := allPeers[p.t] peers := allPeers[p.t]
torrentPiece := p.t.piece(p.index) torrentPiece := p.t.piece(p.index)
if left := storageLeft[p.t.storage.Capacity]; left != nil { if left := storageLeft[p.t.storage.Capacity]; left != nil {
@ -129,6 +130,9 @@ func (cl *Client) doRequests() {
} }
*left -= int64(torrentPiece.length()) *left -= int64(torrentPiece.length())
} }
if p.t.ignorePieceForRequests(p.index) {
continue
}
p.t.piece(p.index).iterUndirtiedChunks(func(chunk ChunkSpec) bool { p.t.piece(p.index).iterUndirtiedChunks(func(chunk ChunkSpec) bool {
req := Request{pp.Integer(p.index), chunk} req := Request{pp.Integer(p.index), chunk}
const skipAlreadyRequested = false const skipAlreadyRequested = false