| Message ID | 20210612095601.7654-1-surban@surban.net |
|---|---|
| State | New |
| Headers | show |
| Series | [BlueZ] gatt-database: No multiple calls to AcquireWrite | expand |
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
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
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);