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

attempt to not make m_buffer_queue_size to ever get negative

This commit is contained in:
Arvid Norberg 2010-03-03 04:32:06 +00:00
parent 4508758f49
commit fdb68ab784
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/disk_io_thread.cpp
View File

@ -380,6 +380,11 @@ namespace libtorrent
}
if (should_cancel_on_abort(*i))
{
if (i->action == disk_io_job::write)
{
TORRENT_ASSERT(m_queue_buffer_size >= i->buffer_size);
m_queue_buffer_size -= i->buffer_size;
}
post_callback(i->callback, *i, -3);
m_jobs.erase(i++);
continue;
@ -1463,6 +1468,12 @@ namespace libtorrent
// and use it later
j = m_jobs.front();
m_jobs.pop_front();
if (j.action == disk_io_job::write)
{
TORRENT_ASSERT(m_queue_buffer_size >= j.buffer_size);
m_queue_buffer_size -= j.buffer_size;
}
jl.unlock();
bool defer = false;
@ -1544,12 +1555,6 @@ namespace libtorrent
disk_buffer_holder holder(*this
, operation_has_buffer(j) ? j.buffer : 0);
if (j.action == disk_io_job::write)
{
TORRENT_ASSERT(m_queue_buffer_size >= j.buffer_size);
m_queue_buffer_size -= j.buffer_size;
}
bool post = false;
if (m_queue_buffer_size + j.buffer_size >= m_settings.max_queued_disk_bytes
&& m_queue_buffer_size < m_settings.max_queued_disk_bytes
@ -1631,6 +1636,11 @@ namespace libtorrent
}
if (should_cancel_on_abort(*i))
{
if (i->action == disk_io_job::write)
{
TORRENT_ASSERT(m_queue_buffer_size >= i->buffer_size);
m_queue_buffer_size -= i->buffer_size;
}
post_callback(i->callback, *i, -3);
m_jobs.erase(i++);
continue;
@ -1683,6 +1693,11 @@ namespace libtorrent
{
if (should_cancel_on_abort(*i))
{
if (i->action == disk_io_job::write)
{
TORRENT_ASSERT(m_queue_buffer_size >= i->buffer_size);
m_queue_buffer_size -= i->buffer_size;
}
post_callback(i->callback, *i, -3);
m_jobs.erase(i++);
continue;