codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

piece picker bug fixes and removed expensive invariant checks

This commit is contained in:
Marcos Pinto 2007-08-27 05:44:12 +00:00
parent b50e1775f0
commit 92c96a9a90
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libtorrent/src/piece_picker.cpp
View File

@ -167,6 +167,7 @@ namespace libtorrent
return; return;
assert(sequenced_download_threshold > 0); assert(sequenced_download_threshold > 0);
if (sequenced_download_threshold <= 0) return;
int old_limit = m_sequenced_download_threshold; int old_limit = m_sequenced_download_threshold;
m_sequenced_download_threshold = sequenced_download_threshold; m_sequenced_download_threshold = sequenced_download_threshold;
@ -191,9 +192,9 @@ namespace libtorrent
// the previous max availability was reached // the previous max availability was reached
// we need to shuffle that bucket, if not, we // we need to shuffle that bucket, if not, we
// don't have to do anything // don't have to do anything
if (int(m_piece_info.size()) > old_limit) if (int(m_piece_info.size()) > old_limit * 2)
{ {
info_t& in = m_piece_info[old_limit]; info_t& in = m_piece_info[old_limit * 2];
std::random_shuffle(in.begin(), in.end()); std::random_shuffle(in.begin(), in.end());
int c = 0; int c = 0;
for (info_t::iterator i = in.begin() for (info_t::iterator i = in.begin()
@ -204,9 +205,9 @@ namespace libtorrent
} }
} }
} }
else if (int(m_piece_info.size()) > sequenced_download_threshold) else if (int(m_piece_info.size()) > sequenced_download_threshold * 2)
{ {
info_t& in = m_piece_info[sequenced_download_threshold]; info_t& in = m_piece_info[sequenced_download_threshold * 2];
std::sort(in.begin(), in.end()); std::sort(in.begin(), in.end());
int c = 0; int c = 0;
for (info_t::iterator i = in.begin() for (info_t::iterator i = in.begin()
@ -214,7 +215,7 @@ namespace libtorrent
{ {
m_piece_map[*i].index = c++; m_piece_map[*i].index = c++;
assert(m_piece_map[*i].priority( assert(m_piece_map[*i].priority(
sequenced_download_threshold) == sequenced_download_threshold); sequenced_download_threshold) == sequenced_download_threshold * 2);
} }
} }
} }
@ -448,7 +449,7 @@ namespace libtorrent
if (i->have()) ++peer_count; if (i->have()) ++peer_count;
if (min_availability > peer_count) if (min_availability > peer_count)
{ {
min_availability = i->peer_count; min_availability = peer_count;
fraction_part += integer_part; fraction_part += integer_part;
integer_part = 1; integer_part = 1;
} }
@ -645,7 +646,7 @@ namespace libtorrent
if (j->finished + j->writing >= complete) return; if (j->finished + j->writing >= complete) return;
using std::swap; using std::swap;
swap(*j, *i); swap(*j, *i);
if (j == m_downloads.begin()) break; if (j == m_downloads.begin()) break;
} }
} }
@ -1141,10 +1142,10 @@ namespace libtorrent
// we're not using rarest first (only for the first // we're not using rarest first (only for the first
// bucket, since that's where the currently downloading // bucket, since that's where the currently downloading
// pieces are) // pieces are)
int start_piece = rand() % m_piece_map.size();
int piece = start_piece;
while (num_blocks > 0) while (num_blocks > 0)
{ {
int start_piece = rand() % m_piece_map.size();
int piece = start_piece;
while (!pieces[piece] while (!pieces[piece]
|| m_piece_map[piece].index == piece_pos::we_have_index || m_piece_map[piece].index == piece_pos::we_have_index
|| m_piece_map[piece].priority(m_sequenced_download_threshold) < 2) || m_piece_map[piece].priority(m_sequenced_download_threshold) < 2)
@ -1164,6 +1165,10 @@ namespace libtorrent
for (int j = 0; j < num_blocks_in_piece; ++j) for (int j = 0; j < num_blocks_in_piece; ++j)
interesting_blocks.push_back(piece_block(piece, j)); interesting_blocks.push_back(piece_block(piece, j));
num_blocks -= (std::min)(num_blocks_in_piece, num_blocks); num_blocks -= (std::min)(num_blocks_in_piece, num_blocks);
++piece;
if (piece == int(m_piece_map.size())) piece = 0;
// could not find any more pieces
if (piece == start_piece) return;
} }
if (num_blocks == 0) return; if (num_blocks == 0) return;
break; break;
@ -1694,4 +1699,3 @@ namespace libtorrent
} }
} }

10
libtorrent/src/policy.cpp
View File

@ -507,7 +507,8 @@ namespace libtorrent
policy::iterator policy::find_connect_candidate() policy::iterator policy::find_connect_candidate()
{ {
INVARIANT_CHECK; // too expensive
// INVARIANT_CHECK;
ptime now = time_now(); ptime now = time_now();
ptime min_connect_time(now); ptime min_connect_time(now);
@ -992,7 +993,8 @@ namespace libtorrent
void policy::peer_from_tracker(const tcp::endpoint& remote, const peer_id& pid void policy::peer_from_tracker(const tcp::endpoint& remote, const peer_id& pid
, int src, char flags) , int src, char flags)
{ {
INVARIANT_CHECK; // too expensive
// INVARIANT_CHECK;
// just ignore the obviously invalid entries // just ignore the obviously invalid entries
if (remote.address() == address() || remote.port() == 0) if (remote.address() == address() || remote.port() == 0)
@ -1317,7 +1319,8 @@ namespace libtorrent
// this is called whenever a peer connection is closed // this is called whenever a peer connection is closed
void policy::connection_closed(const peer_connection& c) throw() void policy::connection_closed(const peer_connection& c) throw()
{ {
INVARIANT_CHECK; // too expensive
// INVARIANT_CHECK;
peer* p = c.peer_info_struct(); peer* p = c.peer_info_struct();
@ -1527,3 +1530,4 @@ namespace libtorrent
} }
} }