wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged error handling fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-01-13 22:35:19 +00:00
parent d92e4dea1c
commit c87d26635b
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@
0.16.7 release
* handle error in read_piece and set_piece_deadline when torrent is removed
* DHT performance improvement
* attempt to handle ERROR_CANT_WAIT disk error on windows
* improve peers exchanged over PEX

19
src/torrent.cpp
View File

@ -936,6 +936,14 @@ namespace libtorrent
void torrent::read_piece(int piece)
{
if (m_abort)
{
// failed
m_ses.m_alerts.post_alert(read_piece_alert(
get_handle(), piece, boost::shared_array<char>(), 0));
return;
}
TORRENT_ASSERT(piece >= 0 && piece < m_torrent_file->num_pieces());
int piece_size = m_torrent_file->piece_size(piece);
int blocks_in_piece = (piece_size + block_size() - 1) / block_size();
@ -3678,6 +3686,17 @@ namespace libtorrent
void torrent::set_piece_deadline(int piece, int t, int flags)
{
if (m_abort)
{
// failed
if (flags & torrent_handle::alert_when_available)
{
m_ses.m_alerts.post_alert(read_piece_alert(
get_handle(), piece, boost::shared_array<char>(), 0));
}
return;
}
ptime deadline = time_now() + milliseconds(t);
if (is_seed() || m_picker->have_piece(piece))