From 089e627153781ae7c320a5a0724c6c70d684b689 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 24 Sep 2018 09:27:01 +0200 Subject: Fix calculation of elapsed usec in downloads A recent change to use chronos inadvertently replaced the difference of new usec - old usec with new sec - old usec, which is obviously wrong. --- apt-pkg/acquire.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 0fee80c5d..541785b03 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1329,7 +1329,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) { std::chrono::duration Delta = std::chrono::seconds(NewTime.tv_sec - Time.tv_sec) + - std::chrono::microseconds(NewTime.tv_sec - Time.tv_usec); + std::chrono::microseconds(NewTime.tv_usec - Time.tv_usec); // Compute the CPS value if (Delta < std::chrono::milliseconds(10)) @@ -1423,7 +1423,7 @@ void pkgAcquireStatus::Stop() std::chrono::duration Delta = std::chrono::seconds(NewTime.tv_sec - StartTime.tv_sec) + - std::chrono::microseconds(NewTime.tv_sec - StartTime.tv_usec); + std::chrono::microseconds(NewTime.tv_usec - StartTime.tv_usec); // Compute the CPS value if (Delta < std::chrono::milliseconds(10)) -- cgit v1.2.3