commit 82a074b191bd01f23f815c46090fcfec501f8778
author Andy Hung <hunga@google.com> Tue Dec 03 14:16:45 2019 -0800
committer Andy Hung <hunga@google.com> Wed Dec 04 14:33:50 2019 -0800
tree b624d81c1f7d829c338e7418eb356951ec9ce27f
parent 1efc9c6f15b61040eb80a5d61b947cd0a6356ed9

MediaMetrics: Add const correctness for items in service

Allows multithreaded use of items without lock.

Test: mediametrics dumpsys, atest mediametrics_tests
Bug: 138583596
Change-Id: Ieb901076b9acc33a89737b320a4fc8ce82f2608d

services/mediaanalytics/MediaAnalyticsService.cpp

diff --git a/services/mediaanalytics/MediaAnalyticsService.cpp b/services/mediaanalytics/MediaAnalyticsService.cpp
index 33a5a90..f1f4761 100644
--- a/services/mediaanalytics/MediaAnalyticsService.cpp
+++ b/services/mediaanalytics/MediaAnalyticsService.cpp
@@ -140,12 +140,12 @@
         return BAD_VALUE;
     }
 
-    // send to statsd
-    extern bool dump2Statsd(MediaAnalyticsItem *item);  // extern hook
-    (void)dump2Statsd(item);  // failure should be logged in function.
+    // now attach either the item or its dup to a const shared pointer
+    std::shared_ptr<const MediaAnalyticsItem> sitem(release ? item : item->dup());
 
-    if (!release) item = item->dup();
-    saveItem(item);
+    extern bool dump2Statsd(const std::shared_ptr<const MediaAnalyticsItem>& item);
+    (void)dump2Statsd(sitem);  // failure should be logged in function.
+    saveItem(sitem);
     return NO_ERROR;
 }
 
@@ -325,7 +325,7 @@
 
 // if item != NULL, it's the item we just inserted
 // true == more items eligible to be recovered
-bool MediaAnalyticsService::expirations_l(MediaAnalyticsItem *item)
+bool MediaAnalyticsService::expirations_l(const std::shared_ptr<const MediaAnalyticsItem>& item)
 {
     bool more = false;
 
@@ -348,7 +348,7 @@
         for (; i < mItems.size(); ++i) {
             auto &oitem = mItems[i];
             nsecs_t when = oitem->getTimestamp();
-            if (oitem.get() == item) {
+            if (oitem.get() == item.get()) {
                 break;
             }
             if (now > when && (now - when) <= mMaxRecordAgeNs) {
@@ -384,7 +384,7 @@
     } while (more);
 }
 
-void MediaAnalyticsService::saveItem(MediaAnalyticsItem *item)
+void MediaAnalyticsService::saveItem(const std::shared_ptr<const MediaAnalyticsItem>& item)
 {
     std::lock_guard _l(mLock);
     // we assume the items are roughly in time order.