Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b49e4f07 authored by Oscar Shu's avatar Oscar Shu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I1e4608ed76c39fdf205c0391d139cd2fa0b5661e
parents 376d7fdd 45cb33bf

wifi/1.5/default/ringbuffer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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

wifi/1.5/default/ringbuffer.h

+1 −0
Original line number Diff line number Diff line
@@ -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_;

wifi/1.5/default/wifi_chip.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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

    }