* [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite
@ 2021-06-11 12:30 Sebastian Urban
2021-06-11 12:53 ` [BlueZ] " bluez.test.bot
2021-06-11 22:31 ` [PATCH BlueZ] " Luiz Augusto von Dentz
0 siblings, 2 replies; 6+ messages in thread
From: Sebastian Urban @ 2021-06-11 12:30 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Urban
This checks if an outstanding call to AcquireWrite is already in
progress. If so, the write request is placed into the queue, but
AcquireWrite is not called again. When a response to AcquireWrite is
received, acquire_write_reply sends all queued writes over the acquired
socket.
Making multiple simultaneous calls to AcquireWrite makes no sense,
as this would open multiple socket pairs and only the last returned
socket would be used for further writes.
---
src/gatt-database.c | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/gatt-database.c b/src/gatt-database.c
index be6dfb265..071f88583 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -2447,6 +2447,7 @@ static void acquire_write_reply(DBusMessage *message, void *user_data)
{
struct pending_op *op = user_data;
struct external_chrc *chrc;
+ struct queue *resend;
DBusError err;
int fd;
uint16_t mtu;
@@ -2488,18 +2489,35 @@ static void acquire_write_reply(DBusMessage *message, void *user_data)
chrc->write_io = sock_io_new(fd, chrc);
- if (sock_io_send(chrc->write_io, op->data.iov_base,
- op->data.iov_len) < 0)
- goto retry;
+ while ((op = queue_peek_head(chrc->pending_writes)) != NULL) {
+ if (sock_io_send(chrc->write_io, op->data.iov_base,
+ op->data.iov_len) < 0)
+ goto retry;
- gatt_db_attribute_write_result(op->attrib, op->id, 0);
+ gatt_db_attribute_write_result(op->attrib, op->id, 0);
+ pending_op_free(op);
+ }
return;
retry:
- send_write(op->device, op->attrib, chrc->proxy, NULL, op->id,
- op->data.iov_base, op->data.iov_len, 0,
- op->link_type, false, false);
+ /*
+ * send_write pushes to chrc->pending_writes, so we need a
+ * temporary queue to avoid an infinite loop.
+ */
+ resend = queue_new();
+
+ while ((op = queue_pop_head(chrc->pending_writes)) != NULL)
+ queue_push_tail(resend, op);
+
+ while ((op = queue_pop_head(resend)) != NULL) {
+ send_write(op->device, op->attrib, chrc->proxy, NULL, op->id,
+ op->data.iov_base, op->data.iov_len, 0,
+ op->link_type, false, false);
+ pending_op_free(op);
+ }
+
+ queue_destroy(resend, NULL);
}
static void acquire_write_setup(DBusMessageIter *iter, void *user_data)
@@ -2527,14 +2545,18 @@ static struct pending_op *acquire_write(struct external_chrc *chrc,
uint8_t link_type)
{
struct pending_op *op;
+ bool acquiring = !queue_isempty(chrc->pending_writes);
op = pending_write_new(device, chrc->pending_writes, attrib, id, value,
len, 0, link_type, false, false);
+ if (acquiring)
+ return op;
+
if (g_dbus_proxy_method_call(chrc->proxy, "AcquireWrite",
acquire_write_setup,
acquire_write_reply,
- op, pending_op_free))
+ op, NULL))
return op;
pending_op_free(op);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [BlueZ] gatt-database: No multiple calls to AcquireWrite
2021-06-11 12:30 [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite Sebastian Urban
@ 2021-06-11 12:53 ` bluez.test.bot
2021-06-11 22:31 ` [PATCH BlueZ] " Luiz Augusto von Dentz
1 sibling, 0 replies; 6+ messages in thread
From: bluez.test.bot @ 2021-06-11 12:53 UTC (permalink / raw)
To: linux-bluetooth, surban
[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=498861
---Test result---
Test Summary:
CheckPatch PASS 0.42 seconds
GitLint PASS 0.13 seconds
Prep - Setup ELL PASS 48.91 seconds
Build - Prep PASS 0.12 seconds
Build - Configure PASS 8.62 seconds
Build - Make PASS 211.88 seconds
Make Check PASS 9.74 seconds
Make Distcheck PASS 251.91 seconds
Build w/ext ELL - Configure PASS 8.66 seconds
Build w/ext ELL - Make PASS 203.92 seconds
Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree
##############################
Test: Make Check - PASS
Desc: Run 'make check'
##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite
2021-06-11 12:30 [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite Sebastian Urban
2021-06-11 12:53 ` [BlueZ] " bluez.test.bot
@ 2021-06-11 22:31 ` Luiz Augusto von Dentz
2021-06-12 9:56 ` Sebastian Urban
1 sibling, 1 reply; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2021-06-11 22:31 UTC (permalink / raw)
To: Sebastian Urban; +Cc: linux-bluetooth
Hi Sebastian,
On Fri, Jun 11, 2021 at 5:32 AM Sebastian Urban <surban@surban.net> wrote:
>
> This checks if an outstanding call to AcquireWrite is already in
> progress. If so, the write request is placed into the queue, but
> AcquireWrite is not called again. When a response to AcquireWrite is
> received, acquire_write_reply sends all queued writes over the acquired
> socket.
>
> Making multiple simultaneous calls to AcquireWrite makes no sense,
> as this would open multiple socket pairs and only the last returned
> socket would be used for further writes.
> ---
> src/gatt-database.c | 38 ++++++++++++++++++++++++++++++--------
> 1 file changed, 30 insertions(+), 8 deletions(-)
>
> diff --git a/src/gatt-database.c b/src/gatt-database.c
> index be6dfb265..071f88583 100644
> --- a/src/gatt-database.c
> +++ b/src/gatt-database.c
> @@ -2447,6 +2447,7 @@ static void acquire_write_reply(DBusMessage *message, void *user_data)
> {
> struct pending_op *op = user_data;
> struct external_chrc *chrc;
> + struct queue *resend;
> DBusError err;
> int fd;
> uint16_t mtu;
> @@ -2488,18 +2489,35 @@ static void acquire_write_reply(DBusMessage *message, void *user_data)
>
> chrc->write_io = sock_io_new(fd, chrc);
>
> - if (sock_io_send(chrc->write_io, op->data.iov_base,
> - op->data.iov_len) < 0)
> - goto retry;
> + while ((op = queue_peek_head(chrc->pending_writes)) != NULL) {
> + if (sock_io_send(chrc->write_io, op->data.iov_base,
> + op->data.iov_len) < 0)
> + goto retry;
>
> - gatt_db_attribute_write_result(op->attrib, op->id, 0);
> + gatt_db_attribute_write_result(op->attrib, op->id, 0);
> + pending_op_free(op);
> + }
>
> return;
>
> retry:
> - send_write(op->device, op->attrib, chrc->proxy, NULL, op->id,
> - op->data.iov_base, op->data.iov_len, 0,
> - op->link_type, false, false);
> + /*
> + * send_write pushes to chrc->pending_writes, so we need a
> + * temporary queue to avoid an infinite loop.
> + */
> + resend = queue_new();
> +
> + while ((op = queue_pop_head(chrc->pending_writes)) != NULL)
> + queue_push_tail(resend, op);
> +
> + while ((op = queue_pop_head(resend)) != NULL) {
> + send_write(op->device, op->attrib, chrc->proxy, NULL, op->id,
> + op->data.iov_base, op->data.iov_len, 0,
> + op->link_type, false, false);
> + pending_op_free(op);
> + }
It might be better to have a separate function to flush the operation
on pending_writes since it just creating another pending_write_new we
could just call WriteValue directly since the original op can be
reused as we no longer free the op automatically.
> + queue_destroy(resend, NULL);
> }
>
> static void acquire_write_setup(DBusMessageIter *iter, void *user_data)
> @@ -2527,14 +2545,18 @@ static struct pending_op *acquire_write(struct external_chrc *chrc,
> uint8_t link_type)
> {
> struct pending_op *op;
> + bool acquiring = !queue_isempty(chrc->pending_writes);
>
> op = pending_write_new(device, chrc->pending_writes, attrib, id, value,
> len, 0, link_type, false, false);
>
> + if (acquiring)
> + return op;
> +
> if (g_dbus_proxy_method_call(chrc->proxy, "AcquireWrite",
> acquire_write_setup,
> acquire_write_reply,
> - op, pending_op_free))
> + op, NULL))
> return op;
>
> pending_op_free(op);
> --
> 2.25.1
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite
2021-06-11 22:31 ` [PATCH BlueZ] " Luiz Augusto von Dentz
@ 2021-06-12 9:56 ` Sebastian Urban
2021-06-12 10:43 ` [BlueZ] " bluez.test.bot
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Urban @ 2021-06-12 9:56 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Urban
This checks if an outstanding call to AcquireWrite is already in
progress. If so, the write request is placed into the queue, but
AcquireWrite is not called again. When a response to AcquireWrite is
received, acquire_write_reply sends all queued writes over the acquired
socket.
Making multiple simultaneous calls to AcquireWrite makes no sense,
as this would open multiple socket pairs and only the last returned
socket would be used for further writes.
---
src/gatt-database.c | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/gatt-database.c b/src/gatt-database.c
index be6dfb265..8cf60c597 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -2378,6 +2378,26 @@ static struct pending_op *send_write(struct btd_device *device,
return NULL;
}
+static void flush_pending_write(void *data, void *user_data)
+{
+ GDBusProxy *proxy = user_data;
+ struct pending_op *op = data;
+
+ if (g_dbus_proxy_method_call(proxy, "WriteValue", write_setup_cb,
+ write_reply_cb,
+ op, pending_op_free) == TRUE)
+ return;
+
+ pending_op_free(op);
+}
+
+static void flush_pending_writes(GDBusProxy *proxy,
+ struct queue *owner_queue)
+{
+ queue_foreach(owner_queue, flush_pending_write, proxy);
+ queue_remove_all(owner_queue, NULL, NULL, NULL);
+}
+
static bool sock_hup(struct io *io, void *user_data)
{
struct external_chrc *chrc = user_data;
@@ -2488,18 +2508,19 @@ static void acquire_write_reply(DBusMessage *message, void *user_data)
chrc->write_io = sock_io_new(fd, chrc);
- if (sock_io_send(chrc->write_io, op->data.iov_base,
- op->data.iov_len) < 0)
- goto retry;
+ while ((op = queue_peek_head(chrc->pending_writes)) != NULL) {
+ if (sock_io_send(chrc->write_io, op->data.iov_base,
+ op->data.iov_len) < 0)
+ goto retry;
- gatt_db_attribute_write_result(op->attrib, op->id, 0);
+ gatt_db_attribute_write_result(op->attrib, op->id, 0);
+ pending_op_free(op);
+ }
return;
retry:
- send_write(op->device, op->attrib, chrc->proxy, NULL, op->id,
- op->data.iov_base, op->data.iov_len, 0,
- op->link_type, false, false);
+ flush_pending_writes(chrc->proxy, chrc->pending_writes);
}
static void acquire_write_setup(DBusMessageIter *iter, void *user_data)
@@ -2527,14 +2548,18 @@ static struct pending_op *acquire_write(struct external_chrc *chrc,
uint8_t link_type)
{
struct pending_op *op;
+ bool acquiring = !queue_isempty(chrc->pending_writes);
op = pending_write_new(device, chrc->pending_writes, attrib, id, value,
len, 0, link_type, false, false);
+ if (acquiring)
+ return op;
+
if (g_dbus_proxy_method_call(chrc->proxy, "AcquireWrite",
acquire_write_setup,
acquire_write_reply,
- op, pending_op_free))
+ op, NULL))
return op;
pending_op_free(op);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [BlueZ] gatt-database: No multiple calls to AcquireWrite
2021-06-12 9:56 ` Sebastian Urban
@ 2021-06-12 10:43 ` bluez.test.bot
2021-06-14 21:05 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 6+ messages in thread
From: bluez.test.bot @ 2021-06-12 10:43 UTC (permalink / raw)
To: linux-bluetooth, surban
[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=499305
---Test result---
Test Summary:
CheckPatch PASS 0.38 seconds
GitLint PASS 0.12 seconds
Prep - Setup ELL PASS 47.67 seconds
Build - Prep PASS 0.14 seconds
Build - Configure PASS 8.35 seconds
Build - Make PASS 219.52 seconds
Make Check PASS 9.72 seconds
Make Distcheck PASS 256.97 seconds
Build w/ext ELL - Configure PASS 8.54 seconds
Build w/ext ELL - Make PASS 203.08 seconds
Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree
##############################
Test: Make Check - PASS
Desc: Run 'make check'
##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [BlueZ] gatt-database: No multiple calls to AcquireWrite
2021-06-12 10:43 ` [BlueZ] " bluez.test.bot
@ 2021-06-14 21:05 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2021-06-14 21:05 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Urban
Hi Sebastian,
On Sat, Jun 12, 2021 at 3:45 AM <bluez.test.bot@gmail.com> wrote:
>
> This is automated email and please do not reply to this email!
>
> Dear submitter,
>
> Thank you for submitting the patches to the linux bluetooth mailing list.
> This is a CI test results with your patch series:
> PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=499305
>
> ---Test result---
>
> Test Summary:
> CheckPatch PASS 0.38 seconds
> GitLint PASS 0.12 seconds
> Prep - Setup ELL PASS 47.67 seconds
> Build - Prep PASS 0.14 seconds
> Build - Configure PASS 8.35 seconds
> Build - Make PASS 219.52 seconds
> Make Check PASS 9.72 seconds
> Make Distcheck PASS 256.97 seconds
> Build w/ext ELL - Configure PASS 8.54 seconds
> Build w/ext ELL - Make PASS 203.08 seconds
>
> Details
> ##############################
> Test: CheckPatch - PASS
> Desc: Run checkpatch.pl script with rule in .checkpatch.conf
>
> ##############################
> Test: GitLint - PASS
> Desc: Run gitlint with rule in .gitlint
>
> ##############################
> Test: Prep - Setup ELL - PASS
> Desc: Clone, build, and install ELL
>
> ##############################
> Test: Build - Prep - PASS
> Desc: Prepare environment for build
>
> ##############################
> Test: Build - Configure - PASS
> Desc: Configure the BlueZ source tree
>
> ##############################
> Test: Build - Make - PASS
> Desc: Build the BlueZ source tree
>
> ##############################
> Test: Make Check - PASS
> Desc: Run 'make check'
>
> ##############################
> Test: Make Distcheck - PASS
> Desc: Run distcheck to check the distribution
>
> ##############################
> Test: Build w/ext ELL - Configure - PASS
> Desc: Configure BlueZ source with '--enable-external-ell' configuration
>
> ##############################
> Test: Build w/ext ELL - Make - PASS
> Desc: Build BlueZ source with '--enable-external-ell' configuration
>
>
>
> ---
> Regards,
> Linux Bluetooth
Applied, thanks.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-14 21:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 12:30 [PATCH BlueZ] gatt-database: No multiple calls to AcquireWrite Sebastian Urban
2021-06-11 12:53 ` [BlueZ] " bluez.test.bot
2021-06-11 22:31 ` [PATCH BlueZ] " Luiz Augusto von Dentz
2021-06-12 9:56 ` Sebastian Urban
2021-06-12 10:43 ` [BlueZ] " bluez.test.bot
2021-06-14 21:05 ` Luiz Augusto von Dentz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.