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

merged RC_1_1 into master

This commit is contained in:
arvidn 2018-05-12 15:37:53 +02:00
parent ddd1168296
commit 8bb1cd2b46
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/peer_connection.cpp
View File

@ -5411,23 +5411,22 @@ namespace libtorrent {
int peer_connection::wanted_transfer(int const channel) int peer_connection::wanted_transfer(int const channel)
{ {
TORRENT_ASSERT(is_single_thread()); TORRENT_ASSERT(is_single_thread());
std::shared_ptr<torrent> t = m_torrent.lock();
const int tick_interval = std::max(1, m_settings.get_int(settings_pack::tick_interval)); const int tick_interval = std::max(1, m_settings.get_int(settings_pack::tick_interval));
if (channel == download_channel) if (channel == download_channel)
{ {
return std::max(std::max(m_outstanding_bytes std::int64_t const download_rate = std::int64_t(m_statistics.download_rate()) * 3 / 2;
, m_recv_buffer.packet_bytes_remaining()) + 30 return std::max({m_outstanding_bytes + 30
, int(std::int64_t(m_statistics.download_rate()) * 2 , m_recv_buffer.packet_bytes_remaining() + 30
* tick_interval / 1000)); , int(download_rate * tick_interval / 1000)});
} }
else else
{ {
return std::max(std::max(m_reading_bytes std::int64_t const upload_rate = std::int64_t(m_statistics.upload_rate()) * 2;
, m_send_buffer.size()) return std::max({m_reading_bytes
, int((std::int64_t(m_statistics.upload_rate()) * 2 , m_send_buffer.size()
* tick_interval) / 1000)); , int(upload_rate * tick_interval / 1000)});
} }
} }
@ -5509,7 +5508,8 @@ namespace libtorrent {
void peer_connection::setup_send() void peer_connection::setup_send()
{ {
TORRENT_ASSERT(is_single_thread()); TORRENT_ASSERT(is_single_thread());
if (m_disconnecting) return;
if (m_disconnecting || m_send_buffer.empty()) return;
// we may want to request more quota at this point // we may want to request more quota at this point
request_bandwidth(upload_channel); request_bandwidth(upload_channel);