diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-06-25 15:02:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 15:02:35 +0000 |
| commit | 3f1381fbcd170f40f22d8b38e735d795e4a755fa (patch) | |
| tree | e0f97b79d0d9fbfe771b1d67813b84a0a6e6cadb /logd/SerializedLogBuffer.cpp | |
| parent | b3a10e52201e3602bf4c4a4120cace63e0bb2304 (diff) | |
| parent | c58d1e4aec4d59b112fa1cc2aa99ed4eb0a25010 (diff) | |
Merge changes I9638e90b,Ib2636dfc am: c58d1e4aec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1349344
Change-Id: I54b5873749ec46f6489d6e6f8224759239b0b25e
Diffstat (limited to 'logd/SerializedLogBuffer.cpp')
| -rw-r--r-- | logd/SerializedLogBuffer.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/logd/SerializedLogBuffer.cpp b/logd/SerializedLogBuffer.cpp index ea9feec27a..0f307945a7 100644 --- a/logd/SerializedLogBuffer.cpp +++ b/logd/SerializedLogBuffer.cpp @@ -276,7 +276,6 @@ bool SerializedLogBuffer::FlushTo( auto& state = reinterpret_cast<SerializedFlushToState&>(abstract_state); state.InitializeLogs(logs_); - state.CheckForNewLogs(); while (state.HasUnreadLogs()) { MinHeapElement top = state.PopNextUnreadLog(); @@ -309,10 +308,6 @@ bool SerializedLogBuffer::FlushTo( return false; } lock.lock(); - - // Since we released the log above, buffers that aren't in our min heap may now have had - // logs added, so re-check them. - state.CheckForNewLogs(); } state.set_start(state.start() + 1); |