Merge "GATT Server queuing" am: 09d0e5dce3 am: fbaba0096a am: 3811677228 (60552deb) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ cc_library_static {
		"gatt/bta_gatts_act.cc",
		"gatt/bta_gatts_api.cc",
		"gatt/bta_gatts_main.cc",
		"gatt/bta_gatts_queue.cc",
		"gatt/bta_gatts_utils.cc",
		"gatt/database.cc",
		"gatt/database_builder.cc",

system/bta/gatt/bta_gatts_queue.cc

0 → 100644

+125 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <list>
		#include <unordered_map>
		#include <unordered_set>

		#include "bta_gatt_server_queue.h"

		using gatts_operation = BtaGattServerQueue::gatts_operation;
		using bluetooth::Uuid;

		constexpr uint8_t GATT_NOTIFY = 1;

		std::unordered_map<uint16_t, std::list<gatts_operation>>
		BtaGattServerQueue::gatts_op_queue;
		std::unordered_set<uint16_t> BtaGattServerQueue::gatts_op_queue_executing;
		std::unordered_map<uint16_t, bool> BtaGattServerQueue::congestion_queue;

		void BtaGattServerQueue::mark_as_not_executing(uint16_t conn_id) {
		gatts_op_queue_executing.erase(conn_id);
		}

		void BtaGattServerQueue::gatts_execute_next_op(uint16_t conn_id) {
		APPL_TRACE_DEBUG("%s: conn_id=0x%x", __func__, conn_id);

		if (gatts_op_queue.empty()) {
		APPL_TRACE_DEBUG("%s: op queue is empty", __func__);
		return;
		}

		auto ptr = congestion_queue.find(conn_id);

		if (ptr != congestion_queue.end()) {
		bool is_congested = ptr->second;
		APPL_TRACE_DEBUG(
		"%s: congestion queue exist, conn_id: %d, is_congested: %d", __func__,
		conn_id, is_congested);
		if (is_congested) {
		APPL_TRACE_DEBUG("%s: lower layer is congested", __func__);
		return;
		}
		}

		auto map_ptr = gatts_op_queue.find(conn_id);

		if (map_ptr == gatts_op_queue.end()) {
		APPL_TRACE_DEBUG("%s: Queue is null", __func__);
		return;
		}

		if (map_ptr->second.empty()) {
		APPL_TRACE_DEBUG("%s: queue is empty for conn_id: %d", __func__, conn_id);
		return;
		}

		if (gatts_op_queue_executing.count(conn_id)) {
		APPL_TRACE_DEBUG("%s: can't enqueue next op, already executing", __func__);
		return;
		}

		gatts_operation op = map_ptr->second.front();
		APPL_TRACE_DEBUG("%s: op.type=%d, attr_id=%d", __func__, op.type, op.attr_id);

		if (op.type == GATT_NOTIFY) {
		BTA_GATTS_HandleValueIndication(conn_id, op.attr_id, op.value,
		op.need_confirm);
		gatts_op_queue_executing.insert(conn_id);
		}
		}

		void BtaGattServerQueue::Clean(uint16_t conn_id) {
		APPL_TRACE_DEBUG("%s: conn_id=0x%x", __func__, conn_id);

		gatts_op_queue.erase(conn_id);
		gatts_op_queue_executing.erase(conn_id);
		}

		void BtaGattServerQueue::SendNotification(uint16_t conn_id, uint16_t handle,
		std::vector<uint8_t> value,
		bool need_confirm) {
		gatts_op_queue[conn_id].emplace_back(
		gatts_operation{.type = GATT_NOTIFY,
		.attr_id = handle,
		.value = value,
		.need_confirm = need_confirm});
		gatts_execute_next_op(conn_id);
		}

		void BtaGattServerQueue::NotificationCallback(uint16_t conn_id) {
		auto map_ptr = gatts_op_queue.find(conn_id);
		if (map_ptr == gatts_op_queue.end() \|\| map_ptr->second.empty()) {
		APPL_TRACE_DEBUG("%s: no more operations queued for conn_id %d", __func__,
		conn_id);
		return;
		}

		gatts_operation op = map_ptr->second.front();
		map_ptr->second.pop_front();
		mark_as_not_executing(conn_id);
		gatts_execute_next_op(conn_id);
		}

		void BtaGattServerQueue::CongestionCallback(uint16_t conn_id, bool congested) {
		APPL_TRACE_DEBUG("%s: conn_id: %d, congested: %d", __func__, conn_id,
		congested);

		congestion_queue[conn_id] = congested;
		if (!congested) {
		gatts_execute_next_op(conn_id);
		}
		}

system/bta/include/bta_gatt_server_queue.h

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <list>
		#include <unordered_map>
		#include <unordered_set>
		#include <vector>

		#include "bta_gatt_api.h"

		class BtaGattServerQueue {
		public:
		static void Clean(uint16_t conn_id);
		static void SendNotification(uint16_t conn_id, uint16_t handle,
		std::vector<uint8_t> value, bool need_confirm);
		static void NotificationCallback(uint16_t conn_id);
		static void CongestionCallback(uint16_t conn_id, bool congested);

		/* Holds pending GATT operations */
		struct gatts_operation {
		uint8_t type;
		uint16_t attr_id;
		std::vector<uint8_t> value;
		bool need_confirm;
		};

		private:
		static bool is_congested;
		static void mark_as_not_executing(uint16_t conn_id);
		static void gatts_execute_next_op(uint16_t conn_id);

		// maps connection id to operations waiting for execution
		static std::unordered_map<uint16_t, std::list<gatts_operation>>
		gatts_op_queue;

		// maps connection id to congestion status of each device
		static std::unordered_map<uint16_t, bool> congestion_queue;

		// contain connection ids that currently execute operations
		static std::unordered_set<uint16_t> gatts_op_queue_executing;
		};
		No newline at end of file