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

added more asserts related to the invariance between the peer connections' request queue and the piece picker

Browse Source
This commit is contained in:
Arvid Norberg
2006-12-16 03:34:56 +00:00
parent 400a2fe82a
commit cf4aa6d6e1
1 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/peer_connection.cpp
View File

@@ -620,25 +620,6 @@ namespace libtorrent
m_download_queue.clear(); m_download_queue.clear();
m_request_queue.clear(); m_request_queue.clear();
#ifndef NDEBUG
if (!t->is_seed())
{
piece_picker& p = t->picker();
const std::vector<piece_picker::downloading_piece>& dlq = p.get_download_queue();
const int blocks_per_piece = static_cast<int>(
t->torrent_file().piece_length() / t->block_size());
for (std::vector<piece_picker::downloading_piece>::const_iterator i =
dlq.begin(); i != dlq.end(); ++i)
{
for (int j = 0; j < blocks_per_piece; ++j)
{
assert(i->info[j].peer != m_remote);
}
}
}
#endif
} }
// ----------------------------- // -----------------------------
@@ -1515,26 +1496,6 @@ namespace libtorrent
t->remove_peer(this); t->remove_peer(this);
#ifndef NDEBUG
if (!t->is_seed())
{
piece_picker& p = t->picker();
const std::vector<piece_picker::downloading_piece>& dlq = p.get_download_queue();
const int blocks_per_piece = static_cast<int>(
t->torrent_file().piece_length() / t->block_size());
for (std::vector<piece_picker::downloading_piece>::const_iterator i =
dlq.begin(); i != dlq.end(); ++i)
{
for (int j = 0; j < blocks_per_piece; ++j)
{
assert(i->info[j].peer != m_remote);
}
}
assert(m_download_queue.empty());
assert(m_request_queue.empty());
}
#endif
m_torrent.reset(); m_torrent.reset();
} }
@@ -1658,26 +1619,6 @@ namespace libtorrent
m_request_queue.pop_back(); m_request_queue.pop_back();
} }
#ifndef NDEBUG
if (!t->is_seed())
{
piece_picker& p = t->picker();
const std::vector<piece_picker::downloading_piece>& dlq = p.get_download_queue();
const int blocks_per_piece = static_cast<int>(
t->torrent_file().piece_length() / t->block_size());
for (std::vector<piece_picker::downloading_piece>::const_iterator i =
dlq.begin(); i != dlq.end(); ++i)
{
for (int j = 0; j < blocks_per_piece; ++j)
{
assert(i->info[j].peer != m_remote);
}
}
}
#endif
// TODO: If we have a limited number of upload // TODO: If we have a limited number of upload
// slots, choke this peer // slots, choke this peer
@@ -2213,6 +2154,37 @@ namespace libtorrent
assert(m_write_pos <= int(m_send_buffer[ assert(m_write_pos <= int(m_send_buffer[
(m_current_send_buffer + 1) & 1].size())); (m_current_send_buffer + 1) & 1].size()));
if (!t->is_seed())
{
piece_picker& p = t->picker();
const std::vector<piece_picker::downloading_piece>& dlq = p.get_download_queue();
const int blocks_per_piece = static_cast<int>(
t->torrent_file().piece_length() / t->block_size());
for (std::vector<piece_picker::downloading_piece>::const_iterator i =
dlq.begin(); i != dlq.end(); ++i)
{
for (int j = 0; j < blocks_per_piece; ++j)
{
if (std::find(m_request_queue.begin(), m_request_queue.end()
, piece_block(i->index, j)) != m_request_queue.end()
||
std::find(m_download_queue.begin(), m_download_queue.end()
, piece_block(i->index, j)) != m_download_queue.end())
{
assert(i->info[j].peer == m_remote);
}
else
{
assert(i->info[j].peer != m_remote);
}
}
}
assert(m_download_queue.empty());
assert(m_request_queue.empty());
}
} }
#endif #endif