Merge "Clear ringbuffer after dumping to file" into sc-dev (45cb33bf) · Commits · e / os / android_hardware_interfaces

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

+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_;

+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
		}