simplified auto scrape

This commit is contained in:
Arvid Norberg 2009-07-24 08:25:07 +00:00
parent 193bccd84b
commit eb66830dc3
1 changed files with 7 additions and 3 deletions

View File

@ -1331,7 +1331,7 @@ namespace aux {
// count the number of peers of downloading torrents // count the number of peers of downloading torrents
int num_downloads_peers = 0; int num_downloads_peers = 0;
torrent_map::iterator least_recently_scraped = m_torrents.begin(); torrent_map::iterator least_recently_scraped = m_torrents.end();
int num_paused_auto_managed = 0; int num_paused_auto_managed = 0;
int num_checking = 0; int num_checking = 0;
@ -1351,8 +1351,7 @@ namespace aux {
if (t.is_auto_managed() && t.is_paused() && !t.has_error()) if (t.is_auto_managed() && t.is_paused() && !t.has_error())
{ {
++num_paused_auto_managed; ++num_paused_auto_managed;
if (!least_recently_scraped->second->is_auto_managed() if (least_recently_scraped == m_torrents.end()
|| !least_recently_scraped->second->is_paused()
|| least_recently_scraped->second->last_scrape() > t.last_scrape()) || least_recently_scraped->second->last_scrape() > t.last_scrape())
{ {
least_recently_scraped = i; least_recently_scraped = i;
@ -1429,8 +1428,13 @@ namespace aux {
m_stat.second_tick(tick_interval_ms); m_stat.second_tick(tick_interval_ms);
TORRENT_ASSERT(least_recently_scraped == m_torrents.end()
|| least_recently_scraped->second->is_paused()
&& least_recently_scraped->second->is_auto_managed());
// -------------------------------------------------------------- // --------------------------------------------------------------
// scrape paused torrents that are auto managed // scrape paused torrents that are auto managed
// (unless the session is paused)
// -------------------------------------------------------------- // --------------------------------------------------------------
if (!is_paused()) if (!is_paused())
{ {