codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disk io priority fix

This commit is contained in:
Marcos Pinto 2007-10-03 22:46:30 +00:00
parent 3273dddb8a
commit 53f4a55711
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libtorrent/src/disk_io_thread.cpp
View File

@ -133,29 +133,27 @@ namespace libtorrent
// when we're reading, we may not skip // when we're reading, we may not skip
// ahead of any write operation that overlaps // ahead of any write operation that overlaps
// the region we're reading // the region we're reading
for (; i != m_jobs.rend(); ++i) for (; i != m_jobs.rend(); i++)
{ {
if (i->action == disk_io_job::read && *i < j) // if *i should come before j, stop
break; // and insert j before i
if (*i < j) break;
// if we come across a write operation that
// overlaps the region we're reading, we need
// to stop
if (i->action == disk_io_job::write if (i->action == disk_io_job::write
&& i->storage == j.storage && i->storage == j.storage
&& i->piece == j.piece && i->piece == j.piece
&& range_overlap(i->offset, i->buffer_size && range_overlap(i->offset, i->buffer_size
, j.offset, j.buffer_size)) , j.offset, j.buffer_size))
{
// we have to stop, and we haven't
// found a suitable place for this job
// so just queue it up at the end
i = m_jobs.rbegin();
break; break;
} }
} }
}
else if (j.action == disk_io_job::write) else if (j.action == disk_io_job::write)
{ {
for (; i != m_jobs.rend(); ++i) for (; i != m_jobs.rend(); ++i)
{ {
if (i->action == disk_io_job::write && *i < j) if (*i < j)
{ {
if (i != m_jobs.rbegin() if (i != m_jobs.rbegin()
&& i.base()->storage.get() != j.storage.get()) && i.base()->storage.get() != j.storage.get())
@ -165,7 +163,12 @@ namespace libtorrent
} }
} }
if (i == m_jobs.rend()) i = m_jobs.rbegin(); // if we are placed in front of all other jobs, put it on the back of
// the queue, to sweep the disk in the same direction, and to avoid
// starvation. The exception is if the priority is higher than the
// job at the front of the queue
if (i == m_jobs.rend() && (m_jobs.empty() || j.priority <= m_jobs.back().priority))
i = m_jobs.rbegin();
std::deque<disk_io_job>::iterator k = m_jobs.insert(i.base(), j); std::deque<disk_io_job>::iterator k = m_jobs.insert(i.base(), j);
k->callback.swap(const_cast<boost::function<void(int, disk_io_job const&)>&>(f)); k->callback.swap(const_cast<boost::function<void(int, disk_io_job const&)>&>(f));
@ -311,3 +314,4 @@ namespace libtorrent
} }
} }