premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

some more piece_picker asserts

This commit is contained in:
Arvid Norberg 2014-01-22 09:53:47 +00:00
parent 120f09454f
commit 99d9916c29
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/piece_picker.cpp
View File

@ -860,6 +860,8 @@ namespace libtorrent
std::vector<downloading_piece>::iterator i = find_dl_piece(index); std::vector<downloading_piece>::iterator i = find_dl_piece(index);
TORRENT_ASSERT(i != m_downloads.end()); TORRENT_ASSERT(i != m_downloads.end());
TORRENT_ASSERT(i->info >= &m_block_info[0]
&& i->info < &m_block_info[0] + m_block_info.size());
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
int num_blocks = blocks_in_piece(i->index); int num_blocks = blocks_in_piece(i->index);
for (int k = 0; k < num_blocks; ++k) for (int k = 0; k < num_blocks; ++k)
@ -2185,6 +2187,8 @@ namespace libtorrent
std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index); std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index);
TORRENT_ASSERT(i != m_downloads.end()); TORRENT_ASSERT(i != m_downloads.end());
TORRENT_ASSERT(i->info >= &m_block_info[0]
&& i->info < &m_block_info[0] + m_block_info.size());
TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index); TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index);
return i->info[block.block_index].state == block_info::state_requested; return i->info[block.block_index].state == block_info::state_requested;
} }
@ -2202,6 +2206,8 @@ namespace libtorrent
if (m_piece_map[block.piece_index].downloading == 0) return false; if (m_piece_map[block.piece_index].downloading == 0) return false;
std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index); std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index);
TORRENT_ASSERT(i != m_downloads.end()); TORRENT_ASSERT(i != m_downloads.end());
TORRENT_ASSERT(i->info >= &m_block_info[0]
&& i->info < &m_block_info[0] + m_block_info.size());
TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index); TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index);
return i->info[block.block_index].state == block_info::state_finished return i->info[block.block_index].state == block_info::state_finished
|| i->info[block.block_index].state == block_info::state_writing; || i->info[block.block_index].state == block_info::state_writing;
@ -2221,6 +2227,8 @@ namespace libtorrent
if (p.downloading == 0) return false; if (p.downloading == 0) return false;
std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index); std::vector<downloading_piece>::const_iterator i = find_dl_piece(block.piece_index);
TORRENT_ASSERT(i != m_downloads.end()); TORRENT_ASSERT(i != m_downloads.end());
TORRENT_ASSERT(i->info >= &m_block_info[0]
&& i->info < &m_block_info[0] + m_block_info.size());
TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index); TORRENT_ASSERT(i->info[block.block_index].piece_index == block.piece_index);
return i->info[block.block_index].state == block_info::state_finished; return i->info[block.block_index].state == block_info::state_finished;
} }
@ -2533,6 +2541,8 @@ namespace libtorrent
TORRENT_ASSERT(index >= 0 && index <= (int)m_piece_map.size()); TORRENT_ASSERT(index >= 0 && index <= (int)m_piece_map.size());
std::vector<downloading_piece>::const_iterator i = find_dl_piece(index); std::vector<downloading_piece>::const_iterator i = find_dl_piece(index);
TORRENT_ASSERT(i != m_downloads.end()); TORRENT_ASSERT(i != m_downloads.end());
TORRENT_ASSERT(i->info >= &m_block_info[0]
&& i->info < &m_block_info[0] + m_block_info.size());
d.clear(); d.clear();
for (int j = 0, end(blocks_in_piece(index)); j != end; ++j) for (int j = 0, end(blocks_in_piece(index)); j != end; ++j)

2
test/setup_transfer.cpp
View File

@ -928,7 +928,7 @@ pid_type web_server_pid = 0;
int start_web_server(bool ssl, bool chunked_encoding) int start_web_server(bool ssl, bool chunked_encoding)
{ {
unsigned int seed = total_microseconds(time_now_hires() - min_time()); unsigned int seed = total_microseconds(time_now_hires() - min_time());
printf("random seed: %u\n", seed); fprintf(stderr, "random seed: %u\n", seed);
std::srand(seed); std::srand(seed);
int port = 5000 + (rand() % 55000); int port = 5000 + (rand() % 55000);