mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: client: do not drop partially sent messages

Browse source 
If the first message has already been partially sent, do not
drop it when looking for redundant messages.
This commit is contained in:
Barnabás Pőcze 2021-11-11 12:39:49 +01:00 • committed by Wim Taymans
parent 4678ea06a0
commit 2d4febaba1
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-protocol-pulse/client.c
View file

@ -292,11 +292,13 @@ int client_flush_messages(struct client *client)
static bool client_prune_subscribe_events(struct client *client, uint32_t mask, uint32_t event, uint32_t id) static bool client_prune_subscribe_events(struct client *client, uint32_t mask, uint32_t event, uint32_t id)
{ {
struct impl *impl = client->impl; struct impl *impl = client->impl;
struct message *m, *t; struct message *m, *t, *first;
if ((event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_NEW) if ((event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_NEW)
return false; return false;
first = spa_list_first(&client->out_messages, struct message, link);
spa_list_for_each_safe_reverse(m, t, &client->out_messages, link) { spa_list_for_each_safe_reverse(m, t, &client->out_messages, link) {
if (m->extra[0] != COMMAND_SUBSCRIBE_EVENT) if (m->extra[0] != COMMAND_SUBSCRIBE_EVENT)
continue; continue;
@ -309,9 +311,12 @@ static bool client_prune_subscribe_events(struct client *client, uint32_t mask,
/* This object is being removed, hence there is /* This object is being removed, hence there is
* point in keeping the old events regarding * point in keeping the old events regarding
* entry in the queue. */ * entry in the queue. */
message_free(impl, m, true, false);
pw_log_debug("client %p: dropped redundant event due to remove event", client); /* if the first message has already been partially sent, do not drop it */
continue; if (m != first || client->out_index == 0) {
message_free(impl, m, true, false);
pw_log_debug("client %p: dropped redundant event due to remove event", client);
}
} }
if ((event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_CHANGE) { if ((event & SUBSCRIPTION_EVENT_TYPE_MASK) == SUBSCRIPTION_EVENT_CHANGE) {