by Luiz Augusto von Dentz

[permalink] [raw]

Subject: Re: [PATCH BlueZ 00/14] Add TS Large Database, more server tests.

Hi Michael,

On Tue, Dec 30, 2014 at 10:32 PM, Michael Janssen <[email protected]> wrote:
> This patchset reworks the way that GATT test databases are defined,
> defines a "large database" as defined by the test spec, adds a set
> of new tests from the test spec.
>
> It also includes some minor cleanup.
>
> Michael Janssen (14):
> shared/gatt-db: Add gatt_db_find_by_type_value
> shared/gatt-server: support Discover by UUID
> unit/gatt: Bugfix small database construction
> unit/gatt: Add add_desc_with_value function
> unit/gatt: Rework service db definitions
> unit/gatt: Add Test Spec Large Database 1
> unit/gatt: Comment cleanup
> unit/gatt: Add /TP/GAD/SR/BV-02-C test
> unit/gatt: Add /TP/GAD/SR/BV-03-C test
> unit/gatt: Add /TP/GAD/SR/BV-04-C test
> unit/gatt: Add clarifying note about dup tests.
> unit/gatt: Add /TP/GAD/SR/BV-06-C test
> unit/gatt: Add /TP/GAR/SR/BV-01-C test
> unit/gatt: Add /TP/GAR/SR/BI-02-C test
>
> src/shared/gatt-db.c | 27 ++
> src/shared/gatt-db.h | 7 +
> src/shared/gatt-server.c | 107 +++++++
> unit/test-gatt.c | 808 +++++++++++++++++++++++++++++++++++++++--------
> 4 files changed, 812 insertions(+), 137 deletions(-)
>
> --
> 2.2.0.rc0.207.ga3a616c

I went ahead and applied patches 3-5, patch 6/14 does not apply:

Applying: unit/gatt: Add Test Spec Large Database 1
WARNING:LONG_LINE: line over 80 characters
#91: FILE: unit/test-gatt.c:961:
+ "11111222223333344444555556666677777888889999900000111112222233333444445555566666777778888899999000001111122222333334444455555666667777788888999990000011111222223333344444555556666677777888889999900000111112222233333444445555566666777778888899999000001111122222333334444455555666667777788888999990000011111222223333344444555556666677777888889999900000111112222233333444445555566666777778888899999000001111122222333334444455555666667777788888999990000011111222223333344444555556666677777888889999900000111112222233"),

WARNING:LONG_LINE: line over 80 characters
#295: FILE: unit/test-gatt.c:1165:
+ "1111122222333334444455555666667777788888999"),

WARNING:LONG_LINE: line over 80 characters
#306: FILE: unit/test-gatt.c:1176:
+ "22222333334444455555666667777788888999990000"),

WARNING:LONG_LINE: line over 80 characters
#317: FILE: unit/test-gatt.c:1187:
+ "333334444455555666667777788888999990000011111"),

--
Luiz Augusto von Dentz

2015-01-02 18:49:14

by Luiz Augusto von Dentz

[permalink] [raw]

Subject: Re: [PATCH BlueZ 01/14] shared/gatt-db: Add gatt_db_find_by_type_value

Hi Michael,

On Tue, Dec 30, 2014 at 10:32 PM, Michael Janssen <[email protected]> wrote:
> Added to support the GATT discovery of services by UUID.
> Currently only works for values which are stored within the attribute
> structure (not callback-based).
> ---
> src/shared/gatt-db.c | 27 +++++++++++++++++++++++++++
> src/shared/gatt-db.h | 7 +++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
> index d2cdacc..bef1308 100644
> --- a/src/shared/gatt-db.c
> +++ b/src/shared/gatt-db.c
> @@ -830,6 +830,8 @@ struct find_by_type_value_data {
> bt_uuid_t uuid;
> uint16_t start_handle;
> uint16_t end_handle;
> + const void *value;
> + size_t value_len;
> };
>
> static void find_by_type(void *data, void *user_data)
> @@ -855,6 +857,12 @@ static void find_by_type(void *data, void *user_data)
> if (bt_uuid_cmp(&search_data->uuid, &attribute->uuid))
> continue;
>
> + /* TODO: fix for read-callback based attributes */
> + if (search_data->value && memcmp(attribute->value,
> + search_data->value,
> + search_data->value_len))
> + continue;
> +
> queue_push_tail(search_data->queue, attribute);
> }
> }
> @@ -874,6 +882,25 @@ void gatt_db_find_by_type(struct gatt_db *db, uint16_t start_handle,
> queue_foreach(db->services, find_by_type, &data);
> }
>
> +void gatt_db_find_by_type_value(struct gatt_db *db, uint16_t start_handle,
> + uint16_t end_handle,
> + const bt_uuid_t *type,
> + const void *value,
> + size_t value_len,
> + struct queue *queue)
> +{
> + struct find_by_type_value_data data;
> +
> + data.uuid = *type;
> + data.start_handle = start_handle;
> + data.end_handle = end_handle;
> + data.queue = queue;
> + data.value = value;
> + data.value_len = value_len;
> +
> + queue_foreach(db->services, find_by_type, &data);
> +}
> +
> struct read_by_type_data {
> struct queue *queue;
> bt_uuid_t uuid;
> diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h
> index f188944..9281671 100644
> --- a/src/shared/gatt-db.h
> +++ b/src/shared/gatt-db.h
> @@ -93,6 +93,13 @@ void gatt_db_find_by_type(struct gatt_db *db, uint16_t start_handle,
> const bt_uuid_t *type,
> struct queue *queue);
>
> +void gatt_db_find_by_type_value(struct gatt_db *db, uint16_t start_handle,
> + uint16_t end_handle,
> + const bt_uuid_t *type,
> + const void *value,
> + size_t value_len,
> + struct queue *queue);
> +

I thought we agreed on not exposing queues anymore so instead this
should take a callback.

> void gatt_db_read_by_type(struct gatt_db *db, uint16_t start_handle,
> uint16_t end_handle,
> const bt_uuid_t type,
> --
> 2.2.0.rc0.207.ga3a616c
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Luiz Augusto von Dentz