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

fixed download piece performance bug in piece picker

This commit is contained in:
Arvid Norberg 2009-09-08 02:38:53 +00:00
parent d69d615be4
commit 72360c3c27
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -79,6 +79,7 @@ release 0.14.6
* fixed checking of fast and suggest messages when used with magnet links
* fixed bug where web seeds would not disconnect if being resolved when
the torrent was paused
* fixed download piece performance bug in piece picker
release 0.14.5

27
src/piece_picker.cpp
View File

@ -765,16 +765,29 @@ namespace libtorrent
void piece_picker::sort_piece(std::vector<downloading_piece>::iterator dp)
{
TORRENT_ASSERT(m_piece_map[dp->index].downloading);
if (dp == m_downloads.begin()) return;
int complete = dp->writing + dp->finished;
for (std::vector<downloading_piece>::iterator i = dp, j(dp-1);
i != m_downloads.begin(); --i, --j)
if (dp != m_downloads.begin())
{
TORRENT_ASSERT(j >= m_downloads.begin());
if (j->finished + j->writing >= complete) return;
for (std::vector<downloading_piece>::iterator j(dp-1);
dp != m_downloads.begin(); --dp, --j)
{
TORRENT_ASSERT(j >= m_downloads.begin());
if (j->finished + j->writing >= complete) break;
using std::swap;
swap(*j, *dp);
if (j == m_downloads.begin()) return;
}
}
TORRENT_ASSERT(dp != m_downloads.end());
for (std::vector<downloading_piece>::iterator j(dp+1);
dp != m_downloads.end() - 1; ++dp, ++j)
{
TORRENT_ASSERT(j < m_downloads.end());
if (j->finished + j->writing <= complete) break;
using std::swap;
swap(*j, *i);
if (j == m_downloads.begin()) break;
swap(*j, *dp);
if (j == m_downloads.end() - 1) return;
}
}