diff mbox series

[BlueZ,1/1] Refactor btd_device_is_connected

Message ID 20240404024521.120349-2-dimitris.on.linux@gmail.com
State Superseded
Headers show
Series Fixes busy loop when disabling | expand

Commit Message

Dimitris April 4, 2024, 2:45 a.m. UTC 
Splitting the service state test out of btd_device_is_connected
and using the state-specific test from adapter_remove_connection.

This intends to fix a busy loop that happens when BT is disabled
from userspace with e.g. "rfkill block bluetooth".
---
 src/adapter.c | 2 +-
 src/device.c  | 7 ++++++-
 src/device.h  | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

Comments

bluez.test.bot@gmail.com April 4, 2024, 4:40 a.m. UTC | #1 
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=841263

---Test result---

Test Summary:
CheckPatch                    PASS      0.45 seconds
GitLint                       PASS      0.31 seconds
BuildEll                      PASS      25.64 seconds
BluezMake                     PASS      1663.82 seconds
MakeCheck                     PASS      13.49 seconds
MakeDistcheck                 PASS      190.09 seconds
CheckValgrind                 PASS      247.23 seconds
CheckSmatch                   PASS      348.43 seconds
bluezmakeextell               PASS      118.28 seconds
IncrementalBuild              PASS      1436.09 seconds
ScanBuild                     PASS      991.93 seconds



---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz April 4, 2024, 2:59 p.m. UTC | #2 
Hi Dimitris,

On Wed, Apr 3, 2024 at 10:46 PM Dimitris <dimitris.on.linux@gmail.com> wrote:
>
> Splitting the service state test out of btd_device_is_connected
> and using the state-specific test from adapter_remove_connection.
>
> This intends to fix a busy loop that happens when BT is disabled
> from userspace with e.g. "rfkill block bluetooth".
> ---
>  src/adapter.c | 2 +-
>  src/device.c  | 7 ++++++-
>  src/device.h  | 1 +
>  3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 4bcc464de..0b7aab4b5 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -7486,7 +7486,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter,
>                 device_cancel_authentication(device, TRUE);
>
>         /* If another bearer is still connected */
> -       if (btd_device_is_connected(device))
> +       if (btd_device_state_is_connected(device))

Perhaps btd_device_bearer_is_connected would be a better name.

>                 return;
>
>         adapter->connections = g_slist_remove(adapter->connections, device);
> diff --git a/src/device.c b/src/device.c
> index 5e74633c6..123b1b796 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -3273,13 +3273,18 @@ uint8_t btd_device_get_bdaddr_type(struct btd_device *dev)
>
>  bool btd_device_is_connected(struct btd_device *dev)
>  {
> -       if (dev->bredr_state.connected || dev->le_state.connected)
> +       if (btd_device_state_is_connected(dev))
>                 return true;
>
>         return find_service_with_state(dev->services,
>                                                 BTD_SERVICE_STATE_CONNECTED);

I guess the problem is that some service is indicating it is still
connected though?

>  }
>
> +bool btd_device_state_is_connected(struct btd_device *dev)
> +{
> +       return dev->bredr_state.connected || dev->le_state.connected;
> +}
> +
>  static void clear_temporary_timer(struct btd_device *dev)
>  {
>         if (dev->temporary_timer) {
> diff --git a/src/device.h b/src/device.h
> index d4e70b7ef..e3191f2a4 100644
> --- a/src/device.h
> +++ b/src/device.h
> @@ -104,6 +104,7 @@ void device_set_rssi(struct btd_device *device, int8_t rssi);
>  void device_set_tx_power(struct btd_device *device, int8_t tx_power);
>  void device_set_flags(struct btd_device *device, uint8_t flags);
>  bool btd_device_is_connected(struct btd_device *dev);
> +bool btd_device_state_is_connected(struct btd_device *dev);
>  uint8_t btd_device_get_bdaddr_type(struct btd_device *dev);
>  bool device_is_retrying(struct btd_device *device);
>  void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
> --
> 2.44.0
>
>
diff mbox series

Patch

diff --git a/src/adapter.c b/src/adapter.c
index 4bcc464de..0b7aab4b5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7486,7 +7486,7 @@  static void adapter_remove_connection(struct btd_adapter *adapter,
 		device_cancel_authentication(device, TRUE);
 
 	/* If another bearer is still connected */
-	if (btd_device_is_connected(device))
+	if (btd_device_state_is_connected(device))
 		return;
 
 	adapter->connections = g_slist_remove(adapter->connections, device);
diff --git a/src/device.c b/src/device.c
index 5e74633c6..123b1b796 100644
--- a/src/device.c
+++ b/src/device.c
@@ -3273,13 +3273,18 @@  uint8_t btd_device_get_bdaddr_type(struct btd_device *dev)
 
 bool btd_device_is_connected(struct btd_device *dev)
 {
-	if (dev->bredr_state.connected || dev->le_state.connected)
+	if (btd_device_state_is_connected(dev))
 		return true;
 
 	return find_service_with_state(dev->services,
 						BTD_SERVICE_STATE_CONNECTED);
 }
 
+bool btd_device_state_is_connected(struct btd_device *dev)
+{
+	return dev->bredr_state.connected || dev->le_state.connected;
+}
+
 static void clear_temporary_timer(struct btd_device *dev)
 {
 	if (dev->temporary_timer) {
diff --git a/src/device.h b/src/device.h
index d4e70b7ef..e3191f2a4 100644
--- a/src/device.h
+++ b/src/device.h
@@ -104,6 +104,7 @@  void device_set_rssi(struct btd_device *device, int8_t rssi);
 void device_set_tx_power(struct btd_device *device, int8_t tx_power);
 void device_set_flags(struct btd_device *device, uint8_t flags);
 bool btd_device_is_connected(struct btd_device *dev);
+bool btd_device_state_is_connected(struct btd_device *dev);
 uint8_t btd_device_get_bdaddr_type(struct btd_device *dev);
 bool device_is_retrying(struct btd_device *device);
 void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,