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

fix assert when pausing session while checking torrents

This commit is contained in:
Arvid Norberg 2011-06-03 08:40:13 +00:00
parent 187361cc20
commit ebba1f3c57
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/session_impl.cpp
View File

@ -1382,7 +1382,7 @@ namespace aux {
, end(m_torrents.end()); i != end; ++i) , end(m_torrents.end()); i != end; ++i)
{ {
torrent& t = *i->second; torrent& t = *i->second;
if (!t.is_torrent_paused()) t.do_pause(); t.do_pause();
} }
} }
@ -1398,6 +1398,7 @@ namespace aux {
torrent& t = *i->second; torrent& t = *i->second;
t.do_resume(); t.do_resume();
} }
if (!m_queued_for_checking.empty()) m_queued_for_checking.front()->start_checking();
} }
void session_impl::abort() void session_impl::abort()
@ -5229,7 +5230,7 @@ namespace aux {
} }
// the queue is either empty, or it has exactly one checking torrent in it // the queue is either empty, or it has exactly one checking torrent in it
TORRENT_ASSERT(m_queued_for_checking.empty() || num_checking == 1); TORRENT_ASSERT(m_queued_for_checking.empty() || num_checking == 1 || (m_paused && num_checking == 0));
std::set<int> unique; std::set<int> unique;
int total_downloaders = 0; int total_downloaders = 0;

11
src/torrent.cpp
View File

@ -5661,12 +5661,22 @@ namespace libtorrent
++found; ++found;
if (i->second->should_check_files()) ++found_active; if (i->second->should_check_files()) ++found_active;
} }
// if the session is paused, there might still be some torrents
// in the checking_files state that haven't been dequeued yet
if (m_ses.is_paused())
{
TORRENT_ASSERT(found_active == 0);
}
else
{
// the case of 2 is in the special case where one switches over from // the case of 2 is in the special case where one switches over from
// checking to complete. // checking to complete.
TORRENT_ASSERT(found_active >= 1); TORRENT_ASSERT(found_active >= 1);
TORRENT_ASSERT(found_active <= 2); TORRENT_ASSERT(found_active <= 2);
TORRENT_ASSERT(found >= 1); TORRENT_ASSERT(found >= 1);
} }
}
TORRENT_ASSERT(m_resume_entry.type() == lazy_entry::dict_t TORRENT_ASSERT(m_resume_entry.type() == lazy_entry::dict_t
|| m_resume_entry.type() == lazy_entry::none_t); || m_resume_entry.type() == lazy_entry::none_t);
@ -6309,6 +6319,7 @@ namespace libtorrent
m_storage->abort_disk_io(); m_storage->abort_disk_io();
dequeue_torrent_check(); dequeue_torrent_check();
set_state(torrent_status::queued_for_checking); set_state(torrent_status::queued_for_checking);
TORRENT_ASSERT(!m_queued_for_checking);
} }
// if this torrent was just paused // if this torrent was just paused