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

fix bandwith rate limit calculation (#2060)

This commit is contained in:
Andrei Kurushin 2017-06-08 13:50:55 +03:00 committed by Arvid Norberg
parent 4de9f6a75b
commit fc0cbfb789
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/libtorrent/bandwidth_limit.hpp
View File

@ -43,7 +43,7 @@ namespace libtorrent {
// member of peer_connection // member of peer_connection
struct TORRENT_EXTRA_EXPORT bandwidth_channel struct TORRENT_EXTRA_EXPORT bandwidth_channel
{ {
static constexpr int inf = std::numeric_limits<int>::max(); static constexpr int inf = std::numeric_limits<std::int32_t>::max();
bandwidth_channel(); bandwidth_channel();
@ -51,8 +51,9 @@ struct TORRENT_EXTRA_EXPORT bandwidth_channel
void throttle(int limit); void throttle(int limit);
int throttle() const int throttle() const
{ {
TORRENT_ASSERT_VAL(m_limit >= 0, m_limit);
TORRENT_ASSERT_VAL(m_limit < inf, m_limit); TORRENT_ASSERT_VAL(m_limit < inf, m_limit);
return int(m_limit); return m_limit;
} }
int quota_left() const; int quota_left() const;
@ -92,7 +93,7 @@ private:
// the limit is the number of bytes // the limit is the number of bytes
// per second we are allowed to use. // per second we are allowed to use.
std::int64_t m_limit; std::int32_t m_limit;
}; };
} }

22
src/bandwidth_limit.cpp
View File

@ -45,9 +45,9 @@ namespace libtorrent {
// 0 means infinite // 0 means infinite
void bandwidth_channel::throttle(int limit) void bandwidth_channel::throttle(int limit)
{ {
TORRENT_ASSERT(limit >= 0); TORRENT_ASSERT_VAL(limit >= 0, limit);
// if the throttle is more than this, we might overflow // if the throttle is more than this, we might overflow
TORRENT_ASSERT(limit < inf); TORRENT_ASSERT_VAL(limit < inf, limit);
m_limit = limit; m_limit = limit;
} }
@ -59,18 +59,26 @@ namespace libtorrent {
void bandwidth_channel::update_quota(int dt_milliseconds) void bandwidth_channel::update_quota(int dt_milliseconds)
{ {
TORRENT_ASSERT_VAL(m_limit >= 0, m_limit);
TORRENT_ASSERT_VAL(m_limit < inf, m_limit);
if (m_limit == 0) return; if (m_limit == 0) return;
// avoid integer overflow // "to_add" should never have int64 overflow: "m_limit" contains < "<int>::max"
if (m_limit >= std::numeric_limits<int>::max() / dt_milliseconds) std::int64_t to_add = (std::int64_t(m_limit) * dt_milliseconds + 500) / 1000;
if (to_add > inf - m_quota_left)
{ {
m_quota_left = std::numeric_limits<int>::max(); m_quota_left = inf;
} }
else else
{ {
m_quota_left += (m_limit * dt_milliseconds + 500) / 1000; m_quota_left += to_add;
if (m_quota_left / 3 > m_limit) m_quota_left = m_limit * 3; if (m_quota_left / 3 > m_limit) m_quota_left = std::int64_t(m_limit) * 3;
// "m_quota_left" will never have int64 overflow but may exceed "<int>::max"
m_quota_left = std::min(m_quota_left, std::int64_t(inf));
} }
distribute_quota = int(std::max(m_quota_left, std::int64_t(0))); distribute_quota = int(std::max(m_quota_left, std::int64_t(0)));
} }

1
test/test_bandwidth_limiter.cpp
View File

@ -466,6 +466,7 @@ TORRENT_TEST(equal_connection)
test_equal_connections(33, 60000); test_equal_connections(33, 60000);
test_equal_connections(33, 500000); test_equal_connections(33, 500000);
test_equal_connections( 1, 1000000); test_equal_connections( 1, 1000000);
test_equal_connections( 1, 6000000);
} }
TORRENT_TEST(conn_var_rate) TORRENT_TEST(conn_var_rate)