Synchronize on_ring_buffer_data_callback and writeRingbufferFiles am: 25b3a6f0a4 (7a67f397) · Commits · e / os / android_hardware_interfaces

wifi/1.4/default/wifi_chip.cpp

+33 −24

Original line number	Diff line number	Diff line
		@@ -1314,7 +1314,10 @@ WifiStatus WifiChip::registerDebugRingBufferCallback() {
		LOG(ERROR) << "Error converting ring buffer status";
		return;
		}
		const auto& target = shared_ptr_this->ringbuffer_map_.find(name);
		{
		std::unique_lock<std::mutex> lk(shared_ptr_this->lock_t);
		const auto& target =
		shared_ptr_this->ringbuffer_map_.find(name);
		if (target != shared_ptr_this->ringbuffer_map_.end()) {
		Ringbuffer& cur_buffer = target->second;
		cur_buffer.append(data);
		@@ -1322,6 +1325,8 @@ WifiStatus WifiChip::registerDebugRingBufferCallback() {
		LOG(ERROR) << "Ringname " << name << " not found";
		return;
		}
		// unlock
		}
		};
		legacy_hal::wifi_error legacy_status =
		legacy_hal_.lock()->registerRingBufferCallbackHandler(
		@@ -1595,6 +1600,8 @@ bool WifiChip::writeRingbufferFilesInternal() {
		return false;
		}
		// write ringbuffers to file
		{
		std::unique_lock<std::mutex> lk(lock_t);
		for (const auto& item : ringbuffer_map_) {
		const Ringbuffer& cur_buffer = item.second;
		if (cur_buffer.getData().empty()) {
		@@ -1615,6 +1622,8 @@ bool WifiChip::writeRingbufferFilesInternal() {
		}
		}
		}
		// unlock
		}
		return true;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#include <list>
		#include <map>
		#include <mutex>

		#include <android-base/macros.h>
		#include <android/hardware/wifi/1.4/IWifiChip.h>
		@@ -272,6 +273,7 @@ class WifiChip : public V1_4::IWifiChip {
		bool is_valid_;
		// Members pertaining to chip configuration.
		uint32_t current_mode_id_;
		std::mutex lock_t;
		std::vector<IWifiChip::ChipMode> modes_;
		// The legacy ring buffer callback API has only a global callback
		// registration mechanism. Use this to check if we have already