06/12: daemon: Fix the displayed GC estimated progress.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit be0fb348b8f9e535510d37cc6b84bec480ef5fa1
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sat Jan 11 22:11:16 2020 +0100

    daemon: Fix the displayed GC estimated progress.
    
    * nix/libstore/gc.cc (LocalStore::deletePathRecursive): Fix computation
    of 'fraction'.  Take 'bytesInvalidated' into account.
---
 nix/libstore/gc.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index 5043963..77d7fa2 100644
--- a/nix/libstore/gc.cc
+++ b/nix/libstore/gc.cc
@@ -426,13 +426,14 @@ void LocalStore::deletePathRecursive(GCState & state, 
const Path & path)
     }
 
     if (state.options.maxFreed != ULLONG_MAX) {
-       double fraction = state.results.bytesFreed + size
-           / state.options.maxFreed;
+       auto freed = state.results.bytesFreed + state.bytesInvalidated;
+       double fraction = ((double) freed) / (double) state.options.maxFreed;
        unsigned int percentage = (fraction > 1. ? 1. : fraction) * 100.;
        printMsg(lvlInfo, format("[%1%%%] deleting '%2%'") % percentage % path);
     } else {
-       size_t total = (state.results.bytesFreed + size) / (1024 * 1024);
-       printMsg(lvlInfo, format("[%1% MiB] deleting '%2%'") % total % path);
+       auto freed = state.results.bytesFreed + state.bytesInvalidated;
+       freed /=  1024ULL * 1024ULL;
+       printMsg(lvlInfo, format("[%1% MiB] deleting '%2%'") % freed % path);
     }
 
     state.results.paths.insert(path);