commit 4a22c409f4cbfe925dd306c082971ec93cdda8ac
author Mark Salyzyn <salyzyn@google.com> Wed Mar 02 19:46:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 02 19:46:54 2016 +0000
tree b820bca5aed3fa314ebf2242d8fc10307c293a4d
parent 0914806cab137ec6ba57d003c4e714e3e0ccf638
parent 04db31dedb31f1cf8ee80c1f8578d19ec5053396

logd: clarify release_Locked() for static analyzer
am: c348416198

* commit 'c3484161980cdea915c893a233f54b14a75d151f':
  logd: clarify release_Locked() for static analyzer

logd/LogTimes.cpp

diff --git a/logd/LogTimes.cpp b/logd/LogTimes.cpp
index a4b96d3..2a04880 100644
--- a/logd/LogTimes.cpp
+++ b/logd/LogTimes.cpp
@@ -90,7 +90,7 @@
         while(it != times.end()) {
             if (*it == me) {
                 times.erase(it);
-                me->release_Locked();
+                me->release_nodelete_Locked();
                 break;
             }
             it++;

logd/LogTimes.h

diff --git a/logd/LogTimes.h b/logd/LogTimes.h
index f5969df..b66ff9e 100644
--- a/logd/LogTimes.h
+++ b/logd/LogTimes.h
@@ -75,7 +75,13 @@
     void triggerSkip_Locked(log_id_t id, unsigned int skip) { skipAhead[id] = skip; }
     void cleanSkip_Locked(void);
 
-    // Called after LogTimeEntry removed from list, lock implicitly held
+    // These called after LogTimeEntry removed from list, lock implicitly held
+    void release_nodelete_Locked(void) {
+        mRelease = true;
+        pthread_cond_signal(&threadTriggeredCondition);
+        // assumes caller code path will call decRef_Locked()
+    }
+
     void release_Locked(void) {
         mRelease = true;
         pthread_cond_signal(&threadTriggeredCondition);