Attachment 122981 Details for Bug 94958 – Patch to fix the issue

Patch to fix the issue

0001-Fix-race-condition-in-BlueZ5-device-disconnection.patch (text/plain), 2.32 KB, created by juha.kuikka on 2016-04-16 00:39:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: juha.kuikka

Created: 2016-04-16 00:39:04 UTC

Size: 2.32 KB

patch

obsolete

>From cc1f70b2067283e8b9759d5078ab43da5720c2d3 Mon Sep 17 00:00:00 2001
>From: Juha Kuikka <juha.kuikka@synapse.com>
>Date: Fri, 15 Apr 2016 17:37:22 -0700
>Subject: [PATCH] Fix race condition in BlueZ5 device disconnection
>
>SW: Pulseaudio 8.0 / BlueZ 5.39
>
>Symptoms:
>While disconnecting/reconnecting a paired bluetooth headset (LG HBS750)
>audio fails roughly on every other connection.
>
>On a failed connection "pactl list cards" shows the bluetooth device's
>card but "Active Profile: off". Issuing "pacmd set-card-profile X
>a2dp_sink" makes audio work immediately.
>
>I realized that when this happened, the previous disconnection did not
>remove the card, instead it was only configured for "Active Profile:
>off" but otherwise left in place.
>
>Upon looking at PA debug logs I saw that the transport for the a2dp_sink
>was first set into disconnected state and then into idle state. In
>"device_connection_changed_cb()" this causes the
>"pa_bluetooth_device_any_transport_connected()" return true and the
>module-bluez5-device is not unloaded.
>
>Further investigation shows that this is caused by a race of
>module-bluez5-device.c:thread_func() and
>MediaPoint1::ClearConfiguration().
>
>When the FD in thread_func() is closed (POLLHUP) an
>BLUETOOTH_MESSAGE_STREAM_FD_HUP message is sent into the main thread.
>The handler of this message unconditionally sets the transport into IDLE
>state. This is a problem if it has already been set into DISCONNECTED
>state.
>---
> src/modules/bluetooth/module-bluez5-device.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
>index 84e6d55..f788c12 100644
>--- a/src/modules/bluetooth/module-bluez5-device.c
>+++ b/src/modules/bluetooth/module-bluez5-device.c
>@@ -2116,7 +2116,8 @@ static int device_process_msg(pa_msgobject *obj, int code, void *data, int64_t o
>             pa_assert_se(pa_card_set_profile(m->card, pa_hashmap_get(m->card->profiles, "off"), false) >= 0);
>             break;
>         case BLUETOOTH_MESSAGE_STREAM_FD_HUP:
>-            pa_bluetooth_transport_set_state(u->transport, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
>+            if (u->transport->state > PA_BLUETOOTH_TRANSPORT_STATE_IDLE )
>+                pa_bluetooth_transport_set_state(u->transport, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
>             break;
>     }
> 
>-- 
>1.9.1
>

Actions: View

Attachments on bug 94958: 122981

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.