commit 9acc9acea544605c85b27a9e2b157fec6766e983
author Yurii Zubrytskyi <zyy@google.com> Wed Mar 24 00:48:24 2021 -0700
committer Alex Buynytskyy <alexbuy@google.com> Wed Mar 24 12:22:39 2021 +0000
tree 921047f76ed94f4b36c665ebfcc09485e0182331
parent fef3257d391588f410d46d100dfc6c1393499fbf

[incfs] Fix the mount state callbacks processing

- use a never-existing storage ID as a job key
- order the jobs in the map to not skip them on changes, or,
  worse, never hang in a loop
- clear the local callbacks vector before moving to the next
  storage ID
- try to resume from the closest place on the next processing
  iteration

Bug: 183435580
Test: atest service.incremental_test
Change-Id: I36cd5d30c656bed62c20bd7a7f84fb58046a0933

services/incremental/IncrementalService.h

diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h
index 105d40c..a697305 100644
--- a/services/incremental/IncrementalService.h
+++ b/services/incremental/IncrementalService.h
@@ -95,7 +95,8 @@
 #pragma GCC diagnostic pop
 
     static constexpr StorageId kInvalidStorageId = -1;
-    static constexpr StorageId kMaxStorageId = std::numeric_limits<int>::max();
+    static constexpr StorageId kMaxStorageId = std::numeric_limits<int>::max() - 1;
+    static constexpr StorageId kAllStoragesId = kMaxStorageId + 1;
 
     static constexpr BootClockTsUs kMaxBootClockTsUs = std::numeric_limits<BootClockTsUs>::max();
 
@@ -472,7 +473,7 @@
     std::mutex mCallbacksLock;
     std::unordered_map<std::string, sp<AppOpsListener>> mCallbackRegistered;
 
-    using IfsStateCallbacks = std::unordered_map<StorageId, std::vector<IfsStateCallback>>;
+    using IfsStateCallbacks = std::map<StorageId, std::vector<IfsStateCallback>>;
     std::mutex mIfsStateCallbacksLock;
     IfsStateCallbacks mIfsStateCallbacks;