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

another piece picker fix (fixes some logic mistakes from last piece picker update)

This commit is contained in:
Arvid Norberg 2008-02-18 20:55:03 +00:00
parent 333839c9b4
commit 01c6300d51
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/piece_picker.cpp
View File

@ -1947,6 +1947,8 @@ namespace libtorrent
return i->info[block.block_index].peer; return i->info[block.block_index].peer;
} }
// this is called when a request is rejected or when
// a peer disconnects. The piece might be in any state
void piece_picker::abort_download(piece_block block) void piece_picker::abort_download(piece_block block)
{ {
TORRENT_PIECE_PICKER_INVARIANT_CHECK; TORRENT_PIECE_PICKER_INVARIANT_CHECK;
@ -1969,26 +1971,15 @@ namespace libtorrent
block_info& info = i->info[block.block_index]; block_info& info = i->info[block.block_index];
TORRENT_ASSERT(info.state == block_info::state_requested); if (i->info[block.block_index].state != block_info::state_requested)
TORRENT_ASSERT(info.num_peers > 0); return;
if (info.num_peers > 0) --info.num_peers;
--info.num_peers;
TORRENT_ASSERT(block.block_index < blocks_in_piece(block.piece_index)); TORRENT_ASSERT(block.block_index < blocks_in_piece(block.piece_index));
// if there are other peers // if there are other peers, leave the block requested
if (info.num_peers > 0) if (info.num_peers > 0) return;
{
if (i->info[block.block_index].state == block_info::state_writing)
{
++i->requested;
--i->writing;
i->info[block.block_index].state = block_info::state_requested;
// since we just cleared the writing state, we know that
// the peer for this block was the one we canceled
info.peer = 0;
}
return;
}
// clear the downloader of this block // clear the downloader of this block
info.peer = 0; info.peer = 0;