commit 3ed7588987db4b08c791207c09b67335de7b60be
author Hunter Knepshield <hknepshield@google.com> Tue Jan 28 01:26:37 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 28 01:26:37 2020 +0000
tree 125591fbf10d3217371bdf7b335cea154571d563
parent ba879c75bd5228872d8f1e9cbde11536a36bc85b
parent f0a3905126e66cd7341b74c34bac1d3c32c1bf50

Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs"

cmds/dumpstate/DumpstateInternal.h

diff --git a/cmds/dumpstate/DumpstateInternal.h b/cmds/dumpstate/DumpstateInternal.h
index 10db5d6..c1ec55e 100644
--- a/cmds/dumpstate/DumpstateInternal.h
+++ b/cmds/dumpstate/DumpstateInternal.h
@@ -49,6 +49,7 @@
 
 // TODO: use functions from <chrono> instead
 const uint64_t NANOS_PER_SEC = 1000000000;
+const uint64_t NANOS_PER_MILLI = 1000000;
 uint64_t Nanotime();
 
 // Switches to non-root user and group.

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index d705fa8..585a98e 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -660,7 +660,7 @@
 }
 
 uint64_t Dumpstate::ConsentCallback::getElapsedTimeMs() const {
-    return Nanotime() - start_time_;
+    return (Nanotime() - start_time_) / NANOS_PER_MILLI;
 }
 
 void Dumpstate::PrintHeader() const {