Refactor bta_gattc_cache_load (7663c029) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_act.cc

+7 −2

Original line number	Diff line number	Diff line
		@@ -501,7 +501,9 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) {
		p_clcb->p_srcb->state != BTA_GATTC_SERV_IDLE) {
		if (p_clcb->p_srcb->state == BTA_GATTC_SERV_IDLE) {
		p_clcb->p_srcb->state = BTA_GATTC_SERV_LOAD;
		if (bta_gattc_cache_load(p_clcb->p_srcb)) {
		gatt::Database db = bta_gattc_cache_load(p_clcb->p_srcb->server_bda);
		if (!db.IsEmpty()) {
		p_clcb->p_srcb->gatt_database = db;
		p_clcb->p_srcb->state = BTA_GATTC_SERV_IDLE;
		bta_gattc_reset_discover_st(p_clcb->p_srcb, GATT_SUCCESS);
		} else {
		@@ -1201,7 +1203,10 @@ static bool bta_gattc_process_srvc_chg_ind(uint16_t conn_id,
		Uuid srvc_chg_uuid = Uuid::From16Bit(GATT_UUID_GATT_SRV_CHGD);

		if (p_srcb->gatt_database.IsEmpty() && p_srcb->state == BTA_GATTC_SERV_IDLE) {
		bta_gattc_cache_load(p_srcb);
		gatt::Database db = bta_gattc_cache_load(p_srcb->server_bda);
		if (!db.IsEmpty()) {
		p_srcb->gatt_database = db;
		}
		}

		const gatt::Characteristic* p_char =

system/bta/gatt/bta_gattc_db_storage.cc

+35 −16

Original line number	Diff line number	Diff line
		@@ -30,30 +30,29 @@ static void bta_gattc_generate_cache_file_name(char* buffer, size_t buffer_len,
		bda.address[4], bda.address[5]);
		}

		static gatt::Database EMPTY_DB;

		/*******************************************************************************
		*
		* Function bta_gattc_cache_load
		* Function bta_gattc_load_db
		*
		* Description Load GATT cache from storage for server.
		* Description Load GATT database from storage.
		*
		* Parameter p_srcb: pointer to server cache, that will
		* be filled from storage
		* Returns true on success, false otherwise
		* Parameter fname: input file name
		*
		* Returns non-empty GATT database on success, empty GATT database
		* otherwise
		*
		******************************************************************************/
		bool bta_gattc_cache_load(tBTA_GATTC_SERV* p_srcb) {
		char fname[255] = {0};
		bta_gattc_generate_cache_file_name(fname, sizeof(fname), p_srcb->server_bda);

		static gatt::Database bta_gattc_load_db(const char* fname) {
		FILE* fd = fopen(fname, "rb");
		if (!fd) {
		LOG(ERROR) << __func__ << ": can't open GATT cache file " << fname
		<< " for reading, error: " << strerror(errno);
		return false;
		return EMPTY_DB;
		}

		uint16_t cache_ver = 0;
		bool success = false;
		uint16_t num_attr = 0;

		if (fread(&cache_ver, sizeof(uint16_t), 1, fd) != 1) {
		@@ -76,16 +75,36 @@ bool bta_gattc_cache_load(tBTA_GATTC_SERV* p_srcb) {
		std::vector<StoredAttribute> attr(num_attr);

		if (fread(attr.data(), sizeof(StoredAttribute), num_attr, fd) != num_attr) {
		LOG(ERROR) << __func__ << "s: can't read GATT attributes: " << fname;
		LOG(ERROR) << __func__ << ": can't read GATT attributes: " << fname;
		goto done;
		}

		p_srcb->gatt_database = gatt::Database::Deserialize(attr, &success);
		bool success = false;
		gatt::Database result = gatt::Database::Deserialize(attr, &success);
		return success ? result : EMPTY_DB;
		}

		done:
		fclose(fd);
		return success;
		return EMPTY_DB;
		}

		/*******************************************************************************
		*
		* Function bta_gattc_cache_load
		*
		* Description Load GATT cache from storage for server.
		*
		* Parameter bd_address: remote device address
		*
		* Returns non-empty GATT database on success, empty GATT database
		* otherwise
		*
		******************************************************************************/
		gatt::Database bta_gattc_cache_load(const RawAddress& server_bda) {
		char fname[255] = {0};
		bta_gattc_generate_cache_file_name(fname, sizeof(fname), server_bda);
		return bta_gattc_load_db(fname);
		}

		/*******************************************************************************
		@@ -100,8 +119,8 @@ done:
		* Returns true on success, false otherwise
		*
		******************************************************************************/
		static bool bta_gattc_store_db(
		const char* fname, const std::vector<StoredAttribute>& attr) {
		static bool bta_gattc_store_db(const char* fname,
		const std::vector<StoredAttribute>& attr) {
		FILE* fd = fopen(fname, "wb");
		if (!fd) {
		LOG(ERROR) << __func__

system/bta/gatt/bta_gattc_int.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -476,9 +476,8 @@ extern tBTA_GATTC_CONN* bta_gattc_conn_find(const RawAddress& remote_bda);
		extern tBTA_GATTC_CONN* bta_gattc_conn_find_alloc(const RawAddress& remote_bda);
		extern bool bta_gattc_conn_dealloc(const RawAddress& remote_bda);

		extern bool bta_gattc_cache_load(tBTA_GATTC_SERV* p_srcb);
		extern void bta_gattc_cache_write(
		const RawAddress& server_bda,
		extern gatt::Database bta_gattc_cache_load(const RawAddress& server_bda);
		extern void bta_gattc_cache_write(const RawAddress& server_bda,
		const gatt::Database& database);
		extern void bta_gattc_cache_reset(const RawAddress& server_bda);