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

fix avoid-readback cache algorithm

This commit is contained in:
Arvid Norberg 2011-09-27 04:05:05 +00:00
parent 4cde952a68
commit f6b6b57c0e
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/disk_io_thread.hpp
View File

@ -336,7 +336,7 @@ namespace libtorrent
, int blocks, int ignore = -1, int options = 0); , int blocks, int ignore = -1, int options = 0);
void flush_expired_pieces(); void flush_expired_pieces();
int flush_contiguous_blocks(cached_piece_entry& p int flush_contiguous_blocks(cached_piece_entry& p
, mutex::scoped_lock& l, int lower_limit = 0); , mutex::scoped_lock& l, int lower_limit = 0, bool avoid_readback = false);
int flush_range(cached_piece_entry& p, int start, int end, mutex::scoped_lock& l); int flush_range(cached_piece_entry& p, int start, int end, mutex::scoped_lock& l);
int cache_block(disk_io_job& j int cache_block(disk_io_job& j
, boost::function<void(int,disk_io_job const&)>& handler , boost::function<void(int,disk_io_job const&)>& handler

24
src/disk_io_thread.cpp
View File

@ -424,15 +424,26 @@ namespace libtorrent
} }
int disk_io_thread::flush_contiguous_blocks(cached_piece_entry& p int disk_io_thread::flush_contiguous_blocks(cached_piece_entry& p
, mutex::scoped_lock& l, int lower_limit) , mutex::scoped_lock& l, int lower_limit, bool avoid_readback)
{ {
// first find the largest range of contiguous blocks // first find the largest range of contiguous blocks
int len = 0; int len = 0;
int current = 0; int current = 0;
int pos = 0; int pos = 0;
int start = 0; int start = 0;
int blocks_in_piece = (p.storage->info()->piece_size(p.piece) int blocks_in_piece = 0;
+ m_block_size - 1) / m_block_size; if (avoid_readback)
{
// with the avoid read-back mode, only consider blocks
// below the next_block_to_hash cursor
blocks_in_piece = p.next_block_to_hash;
}
else
{
blocks_in_piece = (p.storage->info()->piece_size(p.piece)
+ m_block_size - 1) / m_block_size;
}
for (int i = 0; i < blocks_in_piece; ++i) for (int i = 0; i < blocks_in_piece; ++i)
{ {
if (p.blocks[i].buf) ++current; if (p.blocks[i].buf) ++current;
@ -2027,9 +2038,10 @@ namespace libtorrent
// pieces when we need more space in the cache (which will avoid // pieces when we need more space in the cache (which will avoid
// flushing blocks out-of-order) or when we issue a hash job, // flushing blocks out-of-order) or when we issue a hash job,
// wich indicates the piece is completely downloaded // wich indicates the piece is completely downloaded
if (m_settings.disk_cache_algorithm != session_settings::avoid_readback) flush_contiguous_blocks(const_cast<cached_piece_entry&>(*p)
flush_contiguous_blocks(const_cast<cached_piece_entry&>(*p) , l, m_settings.write_cache_line_size
, l, m_settings.write_cache_line_size); , m_settings.disk_cache_algorithm == session_settings::avoid_readback);
if (p->num_blocks == 0) idx.erase(p); if (p->num_blocks == 0) idx.erase(p);
test_error(j); test_error(j);
TORRENT_ASSERT(!j.storage->error()); TORRENT_ASSERT(!j.storage->error());