commit | b49e4f07f77f9da763092bd1be3e8cc22f7caf6e | [log] [tgz] |
---|---|---|
author | Oscar Shu <xshu@google.com> | Mon Jul 12 17:04:46 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 17:04:46 2021 +0000 |
tree | f3afa1208417ae6dee031d720036e63913ea96d4 | |
parent | 376d7fdd33aaf7739d0ab8f5f97f9f5b7d6d947c [diff] | |
parent | 45cb33bf7a67027701a5e8939c0ca571cd4a05ab [diff] |
Merge "Clear ringbuffer after dumping to file" into sc-dev am: 45cb33bf7a Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15257244 Change-Id: I1e4608ed76c39fdf205c0391d139cd2fa0b5661e
diff --git a/wifi/1.5/default/ringbuffer.cpp b/wifi/1.5/default/ringbuffer.cpp index 26971ff..f554111 100644 --- a/wifi/1.5/default/ringbuffer.cpp +++ b/wifi/1.5/default/ringbuffer.cpp
@@ -47,6 +47,11 @@ return data_; } +void Ringbuffer::clear() { + data_.clear(); + size_ = 0; +} + } // namespace implementation } // namespace V1_5 } // namespace wifi
diff --git a/wifi/1.5/default/ringbuffer.h b/wifi/1.5/default/ringbuffer.h index d8b87f2..03fb37a 100644 --- a/wifi/1.5/default/ringbuffer.h +++ b/wifi/1.5/default/ringbuffer.h
@@ -37,6 +37,7 @@ // within |maxSize_|. void append(const std::vector<uint8_t>& input); const std::list<std::vector<uint8_t>>& getData() const; + void clear(); private: std::list<std::vector<uint8_t>> data_;
diff --git a/wifi/1.5/default/wifi_chip.cpp b/wifi/1.5/default/wifi_chip.cpp index 6fa9601..82d794c 100644 --- a/wifi/1.5/default/wifi_chip.cpp +++ b/wifi/1.5/default/wifi_chip.cpp
@@ -1948,8 +1948,8 @@ // write ringbuffers to file { std::unique_lock<std::mutex> lk(lock_t); - for (const auto& item : ringbuffer_map_) { - const Ringbuffer& cur_buffer = item.second; + for (auto& item : ringbuffer_map_) { + Ringbuffer& cur_buffer = item.second; if (cur_buffer.getData().empty()) { continue; } @@ -1967,6 +1967,7 @@ PLOG(ERROR) << "Error writing to file"; } } + cur_buffer.clear(); } // unique_lock unlocked here }