some extra peer logging + fix for previous invariant check

This commit is contained in:
Arvid Norberg 2007-10-18 04:18:09 +00:00
parent b032c26bf0
commit a00f27b7ec
2 changed files with 4 additions and 3 deletions

View File

@ -1925,7 +1925,8 @@ namespace libtorrent
"s: " << r.start << " | " "s: " << r.start << " | "
"l: " << r.length << " | " "l: " << r.length << " | "
"ds: " << statistics().download_rate() << " B/s | " "ds: " << statistics().download_rate() << " B/s | "
"qs: " << m_desired_queue_size << " ]\n"; "qs: " << m_desired_queue_size << " "
"blk: " << (m_request_large_blocks?"large":"single") << " ]\n";
#endif #endif
} }
m_last_piece = time_now(); m_last_piece = time_now();
@ -2898,7 +2899,7 @@ namespace libtorrent
TORRENT_ASSERT(false); TORRENT_ASSERT(false);
} }
if (t->has_picker()) if (t->has_picker() && !t->is_aborted())
{ {
// make sure that pieces that have completed the download // make sure that pieces that have completed the download
// of all their blocks are in the disk io thread's queue // of all their blocks are in the disk io thread's queue

View File

@ -2482,7 +2482,7 @@ namespace libtorrent
TORRENT_ASSERT(total_done == 0); TORRENT_ASSERT(total_done == 0);
} }
if (m_picker) if (m_picker && !m_abort)
{ {
// make sure that pieces that have completed the download // make sure that pieces that have completed the download
// of all their blocks are in the disk io thread's queue // of all their blocks are in the disk io thread's queue