jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Arvid Norberg
2004-02-01 09:47:58 +00:00
parent ae712e83cc
commit 423eee8cfb
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/libtorrent/piece_picker.hpp
View File

@@ -62,10 +62,7 @@ namespace libtorrent
piece_block(int p_index, int b_index) piece_block(int p_index, int b_index)
: piece_index(p_index) : piece_index(p_index)
, block_index(b_index) , block_index(b_index)
{ {}
assert(p_index >= 0);
assert(b_index >= 0);
}
int piece_index; int piece_index;
int block_index; int block_index;
bool operator==(const piece_block& b) const bool operator==(const piece_block& b) const

25
src/policy.cpp
View File

@@ -80,7 +80,11 @@ namespace
+ d.fractional_seconds() / 1000.f; + d.fractional_seconds() / 1000.f;
} }
void request_a_block(torrent& t, peer_connection& c) // the case where ignore_block is motivated is if two peers
// have only one piece that we don't have, and it's the
// same piece for both peers. Then they might get into an
// infinite recursion, fighting to request the same block.
void request_a_block(torrent& t, peer_connection& c, piece_block ignore_block = piece_block(-1, -1))
{ {
float time_for_last_piece = to_seconds(c.last_piece_time()); float time_for_last_piece = to_seconds(c.last_piece_time());
if (time_for_last_piece == 0) time_for_last_piece = 0.001f; if (time_for_last_piece == 0) time_for_last_piece = 0.001f;
@@ -128,6 +132,7 @@ namespace
i != interesting_pieces.end(); i != interesting_pieces.end();
++i) ++i)
{ {
if (*i == ignore_block) continue;
if (p.is_downloading(*i)) if (p.is_downloading(*i))
{ {
busy_pieces.push_back(*i); busy_pieces.push_back(*i);
@@ -136,11 +141,17 @@ namespace
// ok, we found a piece that's not being downloaded // ok, we found a piece that's not being downloaded
// by somebody else. request it from this peer // by somebody else. request it from this peer
// and return
c.send_request(*i); c.send_request(*i);
num_requests--; num_requests--;
if (num_requests <= 0) return; if (num_requests <= 0) return;
} }
// in this case, we could not find any blocks
// that was free. If we couldn't find any busy
// blocks as well, we cannot download anything
// more from this peer.
if (busy_pieces.empty()) return; if (busy_pieces.empty()) return;
// first look for blocks that are just queued // first look for blocks that are just queued
@@ -172,13 +183,17 @@ namespace
} }
} }
assert(peer != 0); if (peer == 0)
{
// we probably couldn't request the block because
// we are ignoring a certain block
}
// this peer doesn't have a faster connection than the // this peer doesn't have a faster connection than the
// slowest peer. Don't take over any blocks // slowest peer. Don't take over any blocks
// TODO: is this correct? shouldn't it take over a piece // TODO: is this correct? shouldn't it take over a piece
// anyways? // anyways?
if (c.statistics().down_peak() / c.download_queue().size() <= down_speed) return; //if (c.statistics().down_peak() / c.download_queue().size() <= down_speed) return;
// find a suitable block to take over from this peer // find a suitable block to take over from this peer
@@ -195,7 +210,9 @@ namespace
c.send_request(block); c.send_request(block);
// the one we interrupted may need to request a new piece // the one we interrupted may need to request a new piece
request_a_block(t, *peer); // make sure it doesn't request the block we just requested
// by giving it as the ignore_block
request_a_block(t, *peer, block);
num_requests--; num_requests--;
} }