2011-03-22 11:46:57

by Dmitriy Paliy

Subject: [PATCH 0/1 v2] Add release all sessions when adapter is switched off

Hi,

This is updated version to previous submission where more detailed comments
are added explaining why g_slist_free is not called after g_slist_foreach,
and second space is removed.

BR,
Dmitriy

2011-03-22 11:46:58

by Dmitriy Paliy

Subject: [PATCH] Add release all sessions when adapter is switched off

All sessions should be released when adapter is switched off. Then a new
RequestSession method call always results in change from power off to power
on such ensuring operational mode. Otherwise, it is possible to end up in
adapter state being powered off after RequestSession succeded.

g_slist_free is not called after g_slist_foreach because the list is updated
using g_slist_remove inside of session_free, which is called for each element
by g_slist_foreach.
---
src/adapter.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index cc4f43e..b0d1773 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2507,6 +2507,10 @@ static void set_mode_complete(struct btd_adapter *adapter)

DBG("");

+ if (adapter->mode == MODE_OFF)
+ g_slist_foreach(adapter->mode_sessions, (GFunc) session_free,
+ NULL);
+
if (adapter->pending_mode == NULL)
return;

--
1.7.1

2011-03-22 10:43:55

by Johan Hedberg

Subject: Re: [PATCH] Add release all sessions when adapter is switched off

Hi Dmitriy,

On Mon, Mar 21, 2011, Dmitriy Paliy wrote:
> All sessions should be released when adapter is switched off. Then a new
> RequestSession method call always results in change from power off to power
> on such ensuring operational mode. Otherwise, it is possible to end up in
> adapter state being powered off after RequestSession succeded.
> ---
> src/adapter.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index cc4f43e..f1c0e2a 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -2507,6 +2507,10 @@ static void set_mode_complete(struct btd_adapter *adapter)
>
> DBG("");
>
> + if (adapter->mode == MODE_OFF)
> + g_slist_foreach(adapter->mode_sessions, (GFunc) session_free,
> + NULL);
> +

Don't you have to do g_slist_free() and adapter->mode_sessions = NULL
too? Oh, and you've got two spaces between (GFunc) and session_free :)

Johan