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

remove invalid assert in the disk thread

This commit is contained in:
arvidn 2016-03-04 20:20:49 -05:00
parent d332a03281
commit 2bd6ad9974
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block_cache.cpp
View File

@ -1083,7 +1083,7 @@ int block_cache::try_evict_blocks(int num, cached_piece_entry* ignore)
// the first pass, only evict blocks that have been
// hashed
if (pass == 0 && pe->hash)
end = pe->hash->offset / block_size();
end = pe->hash->offset / block_size();
// go through the blocks and evict the ones
// that are not dirty and not referenced

2
src/disk_buffer_pool.cpp
View File

@ -473,7 +473,7 @@ namespace libtorrent
#endif
sett.get_str(settings_pack::mmap_cache).empty())
{
int cache_size = sett.get_int(settings_pack::cache_size);
int const cache_size = sett.get_int(settings_pack::cache_size);
if (cache_size < 0)
{
boost::uint64_t phys_ram = total_physical_ram();

31
src/disk_io_thread.cpp
View File

@ -1143,21 +1143,6 @@ namespace libtorrent
return;
}
#if TORRENT_USE_ASSERTS
// TODO: it should clear the hash state even when there's an error, right?
if (j->action == disk_io_job::hash && !j->error.ec)
{
// a hash job should never return without clearing pe->hash
l.lock();
cached_piece_entry* pe = m_disk_cache.find_piece(j);
if (pe != NULL)
{
TORRENT_PIECE_ASSERT(pe->hash == NULL, pe);
}
l.unlock();
}
#endif
if (ret == defer_handler) return;
j->ret = ret;
@ -2251,10 +2236,10 @@ namespace libtorrent
// just read straight from the file
TORRENT_ASSERT(m_magic == 0x1337);
int piece_size = j->storage->files()->piece_size(j->piece);
int block_size = m_disk_cache.block_size();
int blocks_in_piece = (piece_size + block_size - 1) / block_size;
int file_flags = file_flags_for_job(j);
int const piece_size = j->storage->files()->piece_size(j->piece);
int const block_size = m_disk_cache.block_size();
int const blocks_in_piece = (piece_size + block_size - 1) / block_size;
int const file_flags = file_flags_for_job(j);
file::iovec_t iov;
iov.iov_base = m_disk_cache.allocate_buffer("hashing");
@ -2275,7 +2260,7 @@ namespace libtorrent
if (!j->error.ec)
{
boost::uint32_t read_time = total_microseconds(clock_type::now() - start_time);
boost::uint32_t const read_time = total_microseconds(clock_type::now() - start_time);
m_read_time.add_sample(read_time);
m_stats_counters.inc_stats_counter(counters::num_blocks_read);
@ -2302,8 +2287,8 @@ namespace libtorrent
if (m_settings.get_int(settings_pack::cache_size) == 0)
return do_uncached_hash(j);
int piece_size = j->storage->files()->piece_size(j->piece);
int file_flags = file_flags_for_job(j);
int const piece_size = j->storage->files()->piece_size(j->piece);
int const file_flags = file_flags_for_job(j);
mutex::scoped_lock l(m_cache_mutex);
@ -2391,7 +2376,7 @@ namespace libtorrent
int block_size = m_disk_cache.block_size();
int blocks_in_piece = (piece_size + block_size - 1) / block_size;
// keep track of which blocks we have locked by incrementing
// their refcounts. This is used to decrement only these blocks
// later.