1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-28 10:38:45 +00:00

Merge pull request #522 from gjalsem/master

Fix setting the ETA timestamps
This commit is contained in:
Mike Gelfand 2018-04-06 22:49:27 +03:00 committed by GitHub
commit 444f15edf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1429,10 +1429,10 @@ tr_stat const* tr_torrentStat(tr_torrent* tor)
case TR_STATUS_DOWNLOAD:
if (tor->etaDLSpeedCalculatedAt + 800 < now)
{
tor->etaDLSpeedCalculatedAt = now;
tor->etaDLSpeed_Bps = tor->etaDLSpeedCalculatedAt + 4000 < now ?
pieceDownloadSpeed_Bps : /* if no recent previous speed, no need to smooth */
(tor->etaDLSpeed_Bps * 4.0 + pieceDownloadSpeed_Bps) / 5.0; /* smooth across 5 readings */
tor->etaDLSpeedCalculatedAt = now;
}
if (s->leftUntilDone > s->desiredAvailable && tor->info.webseedCount < 1)
@ -1460,10 +1460,10 @@ tr_stat const* tr_torrentStat(tr_torrent* tor)
{
if (tor->etaULSpeedCalculatedAt + 800 < now)
{
tor->etaULSpeedCalculatedAt = now;
tor->etaULSpeed_Bps = tor->etaULSpeedCalculatedAt + 4000 < now ?
pieceUploadSpeed_Bps : /* if no recent previous speed, no need to smooth */
(tor->etaULSpeed_Bps * 4.0 + pieceUploadSpeed_Bps) / 5.0; /* smooth across 5 readings */
tor->etaULSpeedCalculatedAt = now;
}
if (tor->etaULSpeed_Bps == 0)