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

piece picker fixes (introduced when rewriting the piece checking)

This commit is contained in:
Arvid Norberg 2008-05-12 06:20:54 +00:00
parent abb174218b
commit a01c412f9e
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/piece_picker.cpp
View File

@ -133,22 +133,8 @@ namespace libtorrent
{ {
int index = static_cast<int>(i - pieces.begin()); int index = static_cast<int>(i - pieces.begin());
piece_pos& p = m_piece_map[index]; piece_pos& p = m_piece_map[index];
if (*i) if (*i) we_have(index);
{ else TORRENT_ASSERT(p.index == 0);
if (m_sequential_download == index) ++m_sequential_download;
++m_num_have;
p.set_have();
if (p.filtered())
{
++m_num_have_filtered;
TORRENT_ASSERT(m_num_filtered > 0);
--m_num_filtered;
}
}
else
{
p.index = 0;
}
} }
} }

12
src/torrent.cpp
View File

@ -605,6 +605,14 @@ namespace libtorrent
} }
} }
} }
int index = 0;
for (std::vector<bool>::iterator i = m_have_pieces.begin()
, end(m_have_pieces.end()); i != end; ++i, ++index)
{
if (*i) m_picker->we_have(index);
}
TORRENT_ASSERT(m_picker->num_have_filtered() == m_num_pieces);
} }
files_checked(); files_checked();
@ -656,6 +664,8 @@ namespace libtorrent
{ {
m_have_pieces[j.offset] = true; m_have_pieces[j.offset] = true;
++m_num_pieces; ++m_num_pieces;
TORRENT_ASSERT(m_picker);
m_picker->we_have(j.offset);
} }
// we're not done checking yet // we're not done checking yet
@ -3766,6 +3776,7 @@ namespace libtorrent
st.num_incomplete = m_incomplete; st.num_incomplete = m_incomplete;
st.paused = m_paused; st.paused = m_paused;
boost::tie(st.total_done, st.total_wanted_done) = bytes_done(); boost::tie(st.total_done, st.total_wanted_done) = bytes_done();
TORRENT_ASSERT(st.total_wanted_done >= 0);
TORRENT_ASSERT(st.total_done >= st.total_wanted_done); TORRENT_ASSERT(st.total_done >= st.total_wanted_done);
// payload transfer // payload transfer
@ -3826,6 +3837,7 @@ namespace libtorrent
// fill in status that depends on metadata // fill in status that depends on metadata
st.total_wanted = m_torrent_file->total_size(); st.total_wanted = m_torrent_file->total_size();
TORRENT_ASSERT(st.total_wanted >= 0);
if (m_picker.get() && (m_picker->num_filtered() > 0 if (m_picker.get() && (m_picker->num_filtered() > 0
|| m_picker->num_have_filtered() > 0)) || m_picker->num_have_filtered() > 0))