Add storage state and installation ts to dump.
Bug: 160635296
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I524a92aa8c6a7b6961722dc3004a4bb323232297
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index 388f932..11a700c 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -390,6 +390,11 @@
}
}
+template <class Duration>
+static long elapsedMcs(Duration start, Duration end) {
+ return std::chrono::duration_cast<std::chrono::microseconds>(end - start).count();
+}
+
void IncrementalService::onDump(int fd) {
dprintf(fd, "Incremental is %s\n", incfs::enabled() ? "ENABLED" : "DISABLED");
dprintf(fd, "Incremental dir: %s\n", mIncrementalDir.c_str());
@@ -407,6 +412,13 @@
dprintf(fd, " mountId: %d\n", mnt.mountId);
dprintf(fd, " root: %s\n", mnt.root.c_str());
dprintf(fd, " nextStorageDirNo: %d\n", mnt.nextStorageDirNo.load());
+ dprintf(fd, " flags: %d\n", int(mnt.flags));
+ if (mnt.startLoadingTs.time_since_epoch() == Clock::duration::zero()) {
+ dprintf(fd, " not loading\n");
+ } else {
+ dprintf(fd, " startLoading: %llds\n",
+ (long long)(elapsedMcs(mnt.startLoadingTs, Clock::now()) / 1000000));
+ }
if (mnt.dataLoaderStub) {
mnt.dataLoaderStub->onDump(fd);
} else {
@@ -1767,11 +1779,6 @@
}
template <class Duration>
-static long elapsedMcs(Duration start, Duration end) {
- return std::chrono::duration_cast<std::chrono::microseconds>(end - start).count();
-}
-
-template <class Duration>
static constexpr auto castToMs(Duration d) {
return std::chrono::duration_cast<std::chrono::milliseconds>(d);
}