Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3208-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240403205252.71978-1-dimitris.on.linux@gmail.com>
 <20240404024521.120349-1-dimitris.on.linux@gmail.com> <20240404024521.120349-2-dimitris.on.linux@gmail.com>
In-Reply-To: <20240404024521.120349-2-dimitris.on.linux@gmail.com>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Thu, 4 Apr 2024 10:59:00 -0400
Message-ID: <CABBYNZJjSp74CoJU2RYCft_nQi85EWnk9JOvyxMH8YmAtON+8w@mail.gmail.com>
Subject: Re: [PATCH BlueZ 1/1] Refactor btd_device_is_connected
To: Dimitris <dimitris.on.linux@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Dimitris,

On Wed, Apr 3, 2024 at 10:46=E2=80=AFPM Dimitris <dimitris.on.linux@gmail.c=
om> 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_ad=
apter *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 =3D g_slist_remove(adapter->connections, dev=
ice);
> 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_dev=
ice *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_CONNECT=
ED);

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_t=
ype,
> --
> 2.44.0
>
>


--=20
Luiz Augusto von Dentz