Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 05:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Clear ringbuffer after dumping to file" into sc-dev am: 45cb33bf7a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15257244

Change-Id: Idf8abee157f15b4834914166b87add49504185f4
This commit is contained in:
Oscar Shu
2021-07-12 17:06:31 +00:00
committed by Automerger Merge Worker
parent 897d7db371 45cb33bf7a
commit 4773ef50d5
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wifi/1.5/default/ringbuffer.cpp
View File

@@ -47,6 +47,11 @@ const std::list<std::vector<uint8_t>>& Ringbuffer::getData() const {
return data_;
}
void Ringbuffer::clear() {
data_.clear();
size_ = 0;
}
} // namespace implementation
} // namespace V1_5
} // namespace wifi

1
wifi/1.5/default/ringbuffer.h
View File

@@ -37,6 +37,7 @@ class Ringbuffer {
// 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_;

5
wifi/1.5/default/wifi_chip.cpp
View File

@@ -1948,8 +1948,8 @@ bool WifiChip::writeRingbufferFilesInternal() {
// 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 @@ bool WifiChip::writeRingbufferFilesInternal() {
PLOG(ERROR) << "Error writing to file";
}
}
cur_buffer.clear();
}
// unique_lock unlocked here
}