commit 419528be57a37930e662b2acdfebef52f491fec5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 17 21:11:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 17 21:11:04 2019 +0000
tree 56cb0980bb0f7e60c21be35f5203fc6679935632
parent a057b27f2a3ea2e22b9d2517796adabd947192b0
parent f8da61f26ae2bf80dd90ddd9a8f859ba7a05e251

Merge "Add visible logs about fstrim run for block based checkpoints"

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index e784c91..19c1f3c 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "Checkpoint"
 #include "Checkpoint.h"
 #include "VoldUtil.h"
+#include "VolumeManager.h"
 
 #include <fstream>
 #include <list>
@@ -337,10 +338,14 @@
 
             struct fstrim_range range = {};
             range.len = ULLONG_MAX;
+            nsecs_t start = systemTime(SYSTEM_TIME_BOOTTIME);
             if (ioctl(fd, FITRIM, &range)) {
                 PLOG(ERROR) << "Failed to trim " << mount_rec.mount_point;
                 continue;
             }
+            nsecs_t time = systemTime(SYSTEM_TIME_BOOTTIME) - start;
+            LOG(INFO) << "Trimmed " << range.len << " bytes on " << mount_rec.mount_point << " in "
+                      << nanoseconds_to_milliseconds(time) << "ms for checkpoint";
 
             setBowState(mount_rec.blk_device, "1");
         }