commit 3787c9f5c6e85b027864b6f1a8c8fa1947daa5e4
author Yurii Zubrytskyi <zyy@google.com> Mon Apr 06 23:10:28 2020 -0700
committer Yurii Zubrytskyi <zyy@google.com> Tue Apr 07 09:20:35 2020 -0700
tree d3e93427f306129959a79f7b0c6d3487d9750b5a
parent 48079ba38c4035c316c3b10dc474f61e2c5af17f

[incfs] Add time measurement for native libs extraction

Use the "incremental.perflogging" boolean system property
to enable it

+ a bunch of code cleanups

Bug: 152913040
Test: manual

Change-Id: I1cd259ff5821a47ce055003049f77cbf43eba24a

services/incremental/IncrementalService.h

diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h
index ff69633..7ebc41d 100644
--- a/services/incremental/IncrementalService.h
+++ b/services/incremental/IncrementalService.h
@@ -158,6 +158,8 @@
     };
 
 private:
+    static const bool sEnablePerfLogging;
+
     struct IncFsMount {
         struct Bind {
             StorageId storage;
@@ -231,8 +233,10 @@
     void deleteStorage(IncFsMount& ifs);
     void deleteStorageLocked(IncFsMount& ifs, std::unique_lock<std::mutex>&& ifsLock);
     MountMap::iterator getStorageSlotLocked();
-    std::string normalizePathToStorage(const IfsMountPtr incfs, StorageId storage,
+    std::string normalizePathToStorage(const IfsMountPtr& incfs, StorageId storage,
                                        std::string_view path);
+    std::string normalizePathToStorageLocked(IncFsMount::StorageMap::iterator storageIt,
+                                             std::string_view path);
 
     int applyStorageParams(IncFsMount& ifs);