Merge "Properly lock and release ACL connection event callbacks" am: 216d0cfd39 (aa7f72aa) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/acl_manager.cc

+7 −13

Original line number	Original line	Diff line number	Diff line
	@@ -91,20 +91,14 @@ struct AclManager::impl {
	return;		return;
	}		}
	uint16_t handle = packet->GetHandle();		uint16_t handle = packet->GetHandle();
	if (handle == kQualcommDebugHandle) {		if (handle == kQualcommDebugHandle) return;
			if (classic_impl_->send_packet_upward(
			handle, [&packet](struct acl_manager::assembler* assembler) { assembler->on_incoming_packet(*packet); }))
	return;		return;
	}		if (le_impl_->send_packet_upward(
	auto connection_pair = classic_impl_->acl_connections_.find(handle);		handle, [&packet](struct acl_manager::assembler* assembler) { assembler->on_incoming_packet(*packet); }))
	if (connection_pair != classic_impl_->acl_connections_.end()) {
	connection_pair->second.assembler_.on_incoming_packet(*packet);
	} else {
	auto le_connection_pair = le_impl_->le_acl_connections_.find(handle);
	if (le_connection_pair == le_impl_->le_acl_connections_.end()) {
	LOG_INFO("Dropping packet of size %zu to unknown connection 0x%0hx", packet->size(), handle);
	return;		return;
	}		LOG_INFO("Dropping packet of size %zu to unknown connection 0x%0hx", packet->size(), packet->GetHandle());
	le_connection_pair->second.assembler_.on_incoming_packet(*packet);
	}
	}		}

	void Dump(		void Dump(

system/gd/hci/acl_manager/classic_acl_connection.cc

+11 −9

Original line number	Original line	Diff line number	Diff line
	@@ -327,16 +327,19 @@ struct ClassicAclConnection::impl {
	const Address& address,		const Address& address,
	uint16_t connection_handle)		uint16_t connection_handle)
	: tracker(acl_connection_interface, address, connection_handle), queue_(std::move(queue)) {}		: tracker(acl_connection_interface, address, connection_handle), queue_(std::move(queue)) {}
	ConnectionManagementCallbacks* GetEventCallbacks() {		ConnectionManagementCallbacks* GetEventCallbacks(std::function<void(uint16_t)> invalidate_callbacks) {
	ASSERT(!callbacks_given_);		ASSERT_LOG(!invalidate_callbacks_, "Already returned event callbacks for this connection");
	callbacks_given_ = true;		invalidate_callbacks_ = std::move(invalidate_callbacks);
	return &tracker;		return &tracker;
	}		}
			void PutEventCallbacks() {
			if (invalidate_callbacks_) invalidate_callbacks_(tracker.connection_handle_);
			invalidate_callbacks_ = {};
			}

	bool callbacks_given_{false};
	AclConnectionTracker tracker;		AclConnectionTracker tracker;
	std::shared_ptr<Queue> queue_;		std::shared_ptr<Queue> queue_;
	std::shared_ptr<std::atomic<bool>> is_callback_valid_;		std::function<void(uint16_t)> invalidate_callbacks_;
	};		};

	ClassicAclConnection::ClassicAclConnection()		ClassicAclConnection::ClassicAclConnection()
	@@ -350,14 +353,13 @@ ClassicAclConnection::ClassicAclConnection(std::shared_ptr<Queue> queue,
	}		}

	ClassicAclConnection::~ClassicAclConnection() {		ClassicAclConnection::~ClassicAclConnection() {
	if (pimpl_->is_callback_valid_) *pimpl_->is_callback_valid_ = false;		pimpl_->PutEventCallbacks();
	delete pimpl_;		delete pimpl_;
	}		}

	ConnectionManagementCallbacks* ClassicAclConnection::GetEventCallbacks(		ConnectionManagementCallbacks* ClassicAclConnection::GetEventCallbacks(
	std::shared_ptr<std::atomic<bool>> is_callback_valid) {		std::function<void(uint16_t)> invalidate_callbacks) {
	pimpl_->is_callback_valid_ = is_callback_valid;		return pimpl_->GetEventCallbacks(std::move(invalidate_callbacks));
	return pimpl_->GetEventCallbacks();
	}		}

	void ClassicAclConnection::RegisterCallbacks(ConnectionManagementCallbacks* callbacks, os::Handler* handler) {		void ClassicAclConnection::RegisterCallbacks(ConnectionManagementCallbacks* callbacks, os::Handler* handler) {

system/gd/hci/acl_manager/classic_acl_connection.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ class ClassicAclConnection : public AclConnection {
	virtual bool ReadRemoteExtendedFeatures(uint8_t page_number);		virtual bool ReadRemoteExtendedFeatures(uint8_t page_number);

	// Called once before passing the connection to the client		// Called once before passing the connection to the client
	virtual ConnectionManagementCallbacks* GetEventCallbacks(std::shared_ptr<std::atomic<bool>> is_callback_valid);		virtual ConnectionManagementCallbacks* GetEventCallbacks(std::function<void(uint16_t)> invalidate_callbacks);

	private:		private:
	AclConnectionInterface* acl_connection_interface_;		AclConnectionInterface* acl_connection_interface_;

system/gd/hci/acl_manager/classic_impl.h

+290 −265

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/acl_manager/le_acl_connection.cc

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -85,16 +85,17 @@ class LeAclConnectionTracker : public LeConnectionManagementCallbacks {
	struct LeAclConnection::impl {		struct LeAclConnection::impl {
	impl(LeAclConnectionInterface* le_acl_connection_interface, std::shared_ptr<Queue> queue, uint16_t connection_handle)		impl(LeAclConnectionInterface* le_acl_connection_interface, std::shared_ptr<Queue> queue, uint16_t connection_handle)
	: queue_(std::move(queue)), tracker(le_acl_connection_interface, connection_handle) {}		: queue_(std::move(queue)), tracker(le_acl_connection_interface, connection_handle) {}
	LeConnectionManagementCallbacks* GetEventCallbacks() {		LeConnectionManagementCallbacks* GetEventCallbacks(std::function<void(uint16_t)> invalidate_callbacks) {
	ASSERT(!callbacks_given_);		ASSERT_LOG(!invalidate_callbacks_, "Already returned event callbacks for this connection");
	callbacks_given_ = true;		invalidate_callbacks_ = std::move(invalidate_callbacks);
	return &tracker;		return &tracker;
	}		}
			void PutEventCallbacks() {
	bool callbacks_given_{false};		if (invalidate_callbacks_) invalidate_callbacks_(tracker.connection_handle_);
			}
	std::shared_ptr<Queue> queue_;		std::shared_ptr<Queue> queue_;
	LeAclConnectionTracker tracker;		LeAclConnectionTracker tracker;
	std::shared_ptr<std::atomic<bool>> is_callback_valid_;		std::function<void(uint16_t)> invalidate_callbacks_;
	};		};

	LeAclConnection::LeAclConnection()		LeAclConnection::LeAclConnection()
	@@ -116,7 +117,7 @@ LeAclConnection::LeAclConnection(
	}		}

	LeAclConnection::~LeAclConnection() {		LeAclConnection::~LeAclConnection() {
	if (pimpl_->is_callback_valid_) *pimpl_->is_callback_valid_ = false;		pimpl_->PutEventCallbacks();
	delete pimpl_;		delete pimpl_;
	}		}

	@@ -140,9 +141,8 @@ void LeAclConnection::Disconnect(DisconnectReason reason) {
	}		}

	LeConnectionManagementCallbacks* LeAclConnection::GetEventCallbacks(		LeConnectionManagementCallbacks* LeAclConnection::GetEventCallbacks(
	std::shared_ptr<std::atomic<bool>> is_callback_valid) {		std::function<void(uint16_t)> invalidate_callbacks) {
	pimpl_->is_callback_valid_ = is_callback_valid;		return pimpl_->GetEventCallbacks(std::move(invalidate_callbacks));
	return pimpl_->GetEventCallbacks();
	}		}

	bool LeAclConnection::LeConnectionUpdate(uint16_t conn_interval_min, uint16_t conn_interval_max, uint16_t conn_latency,		bool LeAclConnection::LeConnectionUpdate(uint16_t conn_interval_min, uint16_t conn_interval_max, uint16_t conn_latency,