diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-07-17 17:30:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 17:30:01 +0000 |
| commit | e781da96b51abdce32e8795dd2aca1de223b625e (patch) | |
| tree | 00a3d40cff212d18c693e5dae05fa23afc0e174e /logd/SerializedFlushToState.cpp | |
| parent | ce95e551045e0b391fa0aff35814c7ee8f2009ea (diff) | |
| parent | e7e77f71c4de51d600f467be59e1d762a682149a (diff) | |
Merge "logd: always compress SerializedLogChunk in FinishWriting()" am: aa0358b8fe am: e7e77f71c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1365225
Change-Id: I8e86c68e53270f411016e0a8489e0417334c09b7
Diffstat (limited to 'logd/SerializedFlushToState.cpp')
| -rw-r--r-- | logd/SerializedFlushToState.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logd/SerializedFlushToState.cpp b/logd/SerializedFlushToState.cpp index 2633348cf..b02ccc349 100644 --- a/logd/SerializedFlushToState.cpp +++ b/logd/SerializedFlushToState.cpp @@ -31,7 +31,7 @@ SerializedFlushToState::SerializedFlushToState(uint64_t start, LogMask log_mask) SerializedFlushToState::~SerializedFlushToState() { log_id_for_each(i) { if (log_positions_[i]) { - log_positions_[i]->buffer_it->DecReaderRefCount(true); + log_positions_[i]->buffer_it->DecReaderRefCount(); } } } @@ -78,7 +78,7 @@ void SerializedFlushToState::AddMinHeapEntry(log_id_t log_id) { logs_needed_from_next_position_[log_id] = true; } else { // Otherwise, if there is another buffer piece, move to that and do the same check. - buffer_it->DecReaderRefCount(true); + buffer_it->DecReaderRefCount(); ++buffer_it; buffer_it->IncReaderRefCount(); log_positions_[log_id]->read_offset = 0; @@ -134,7 +134,7 @@ void SerializedFlushToState::Prune(log_id_t log_id, } // // Decrease the ref count since we're deleting our reference. - buffer_it->DecReaderRefCount(false); + buffer_it->DecReaderRefCount(); // Delete in the reference. log_positions_[log_id].reset(); |