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

fix disk queue counters

This commit is contained in:
Arvid Norberg 2011-02-01 16:55:32 +00:00
parent b842815710
commit 012bfba3f7
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/peer_connection.cpp
View File

@ -3323,6 +3323,17 @@ namespace libtorrent
INVARIANT_CHECK; INVARIANT_CHECK;
if (m_channel_state[upload_channel] == peer_info::bw_disk)
{
m_ses.dec_disk_queue(upload_channel);
m_channel_state[upload_channel] = peer_info::bw_idle;
}
if (m_channel_state[download_channel] == peer_info::bw_disk)
{
m_ses.dec_disk_queue(download_channel);
m_channel_state[download_channel] = peer_info::bw_idle;
}
if (m_connecting && m_connection_ticket >= 0) if (m_connecting && m_connection_ticket >= 0)
{ {
m_ses.m_half_open.done(m_connection_ticket); m_ses.m_half_open.done(m_connection_ticket);
@ -4361,6 +4372,7 @@ namespace libtorrent
TORRENT_ASSERT(priority < 0xffff); TORRENT_ASSERT(priority < 0xffff);
// peers that we are not interested in are non-prioritized // peers that we are not interested in are non-prioritized
TORRENT_ASSERT(m_channel_state[upload_channel] != peer_info::bw_disk);
m_channel_state[upload_channel] = peer_info::bw_limit; m_channel_state[upload_channel] = peer_info::bw_limit;
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING
peer_log(">>> REQUEST_BANDWIDTH [ upload: %d prio: %d " peer_log(">>> REQUEST_BANDWIDTH [ upload: %d prio: %d "
@ -4406,6 +4418,7 @@ namespace libtorrent
TORRENT_ASSERT(m_channel_state[download_channel] == peer_info::bw_idle TORRENT_ASSERT(m_channel_state[download_channel] == peer_info::bw_idle
|| m_channel_state[download_channel] == peer_info::bw_disk); || m_channel_state[download_channel] == peer_info::bw_disk);
TORRENT_ASSERT(m_outstanding_bytes >= 0); TORRENT_ASSERT(m_outstanding_bytes >= 0);
TORRENT_ASSERT(m_channel_state[download_channel] != peer_info::bw_disk);
m_channel_state[download_channel] = peer_info::bw_limit; m_channel_state[download_channel] = peer_info::bw_limit;
m_ses.m_download_rate.request_bandwidth(self() m_ses.m_download_rate.request_bandwidth(self()
, (std::max)((std::max)(m_outstanding_bytes, m_packet_size - m_recv_pos) + 30 , (std::max)((std::max)(m_outstanding_bytes, m_packet_size - m_recv_pos) + 30
@ -4606,6 +4619,7 @@ namespace libtorrent
add_outstanding_async("peer_connection::on_receive_data"); add_outstanding_async("peer_connection::on_receive_data");
#endif #endif
++m_read_recurse; ++m_read_recurse;
TORRENT_ASSERT(m_channel_state[download_channel] != peer_info::bw_disk);
m_channel_state[download_channel] = peer_info::bw_network; m_channel_state[download_channel] = peer_info::bw_network;
on_receive_data(ec, bytes_transferred); on_receive_data(ec, bytes_transferred);
--m_read_recurse; --m_read_recurse;
@ -4689,6 +4703,7 @@ namespace libtorrent
if (s == read_async) if (s == read_async)
{ {
TORRENT_ASSERT(m_channel_state[download_channel] != peer_info::bw_disk);
m_channel_state[download_channel] = peer_info::bw_network; m_channel_state[download_channel] = peer_info::bw_network;
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING
peer_log("<<< ASYNC_READ [ max: %d bytes ]", max_receive); peer_log("<<< ASYNC_READ [ max: %d bytes ]", max_receive);
@ -5023,8 +5038,11 @@ namespace libtorrent
if (!disk) if (!disk)
{ {
if (m_channel_state[download_channel] != peer_info::bw_disk) m_ses.inc_disk_queue(download_channel); if (state)
if (state) *state = peer_info::bw_disk; {
if (*state != peer_info::bw_disk) m_ses.inc_disk_queue(download_channel);
*state = peer_info::bw_disk;
}
return false; return false;
} }
@ -5240,6 +5258,7 @@ namespace libtorrent
&& m_requests_in_buffer.front() <= 0) && m_requests_in_buffer.front() <= 0)
m_requests_in_buffer.erase(m_requests_in_buffer.begin()); m_requests_in_buffer.erase(m_requests_in_buffer.begin());
TORRENT_ASSERT(m_channel_state[upload_channel] != peer_info::bw_disk);
m_channel_state[upload_channel] = peer_info::bw_idle; m_channel_state[upload_channel] = peer_info::bw_idle;
TORRENT_ASSERT(int(bytes_transferred) <= m_quota[upload_channel]); TORRENT_ASSERT(int(bytes_transferred) <= m_quota[upload_channel]);