d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix rate calculation when interval is too low

Browse Source 
PR #17155.
This commit is contained in:
Vladimir Golovnev 2022-06-08 08:51:48 +03:00 committed by GitHub
parent fb5f563537
commit ca07540675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base/bittorrent/session.cpp
View File

@ -5137,7 +5137,15 @@ void Session::handleExternalIPAlert(const lt::external_ip_alert *p)
void Session::handleSessionStatsAlert(const lt::session_stats_alert *p) void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)
{ {
const qreal interval = lt::total_milliseconds(p->timestamp() - m_statsLastTimestamp) / 1000.; if (m_refreshEnqueued)
m_refreshEnqueued = false;
else
enqueueRefresh();
const int64_t interval = lt::total_microseconds(p->timestamp() - m_statsLastTimestamp);
if (interval <= 0)
return;
m_statsLastTimestamp = p->timestamp(); m_statsLastTimestamp = p->timestamp();
const auto stats = p->counters(); const auto stats = p->counters();
@ -5158,7 +5166,9 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)
const auto calcRate = [interval](const qint64 previous, const qint64 current) -> qint64 const auto calcRate = [interval](const qint64 previous, const qint64 current) -> qint64
{ {
Q_ASSERT(current >= previous); Q_ASSERT(current >= previous);
return ((current - previous) / interval); Q_ASSERT(interval >= 0);
using namespace std::chrono_literals;
return (((current - previous) * lt::microseconds(1s).count()) / interval);
}; };
m_status.payloadDownloadRate = calcRate(m_status.totalPayloadDownload, totalPayloadDownload); m_status.payloadDownloadRate = calcRate(m_status.totalPayloadDownload, totalPayloadDownload);
@ -5204,11 +5214,6 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p)
? (stats[m_metricIndices.disk.diskJobTime] / totalJobs) : 0; ? (stats[m_metricIndices.disk.diskJobTime] / totalJobs) : 0;
emit statsUpdated(); emit statsUpdated();
if (m_refreshEnqueued)
m_refreshEnqueued = false;
else
enqueueRefresh();
} }
void Session::handleAlertsDroppedAlert(const lt::alerts_dropped_alert *p) const void Session::handleAlertsDroppedAlert(const lt::alerts_dropped_alert *p) const