[PATCH 1/3] gdbus: Don't try to remove removed sources

[PATCH 1/3] gdbus: Don't try to remove removed sources

[Bastien Nocera]

When we return FALSE from idle handlers, the source is removed.
This will be causing warnings in glib 2.40.

See https://bugzilla.gnome.org/show_bug.cgi?id=710724
---
 gdbus/object.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdbus/object.c b/gdbus/object.c
index 268fed5..b248cbb 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -1006,6 +1006,8 @@ static gboolean process_changes(gpointer user_data)
 	if (data->removed != NULL)
 		emit_interfaces_removed(data);
 
+	data->process_id = 0;
+
 	return FALSE;
 }
 
@@ -1019,6 +1021,7 @@ static void generic_unregister(DBusConnection *connection, void *user_data)
 
 	if (data->process_id > 0) {
 		g_source_remove(data->process_id);
+		data->process_id = 0;
 		process_changes(data);
 	}
 
-- 
1.8.4.2

Re: [PATCH 1/3] gdbus: Don't try to remove removed sources

[Bastien Nocera]

On Sat, 2013-11-09 at 18:02 +0100, Bastien Nocera wrote:
> When we return FALSE from idle handlers, the source is removed.
> This will be causing warnings in glib 2.40.
> 
> See https://bugzilla.gnome.org/show_bug.cgi?id=710724

Note that there's plenty of other places where this should be fixed.
I'll leave those up to somebody who doesn't get RSI ;)

Re: [PATCH 1/3] gdbus: Don't try to remove removed sources

[Johan Hedberg]

Hi Bastien,

On Sat, Nov 09, 2013, Bastien Nocera wrote:
> When we return FALSE from idle handlers, the source is removed.
> This will be causing warnings in glib 2.40.
> 
> See https://bugzilla.gnome.org/show_bug.cgi?id=710724
> ---
>  gdbus/object.c | 3 +++
>  1 file changed, 3 insertions(+)

This patch has been applied. Thanks.

Johan

Re: [PATCH 1/3] gdbus: Don't try to remove removed sources

[Luiz Augusto von Dentz]

Hi Bastien,

On Sat, Nov 9, 2013 at 7:04 PM, Bastien Nocera <hadess@hadess.net> wrote:
> On Sat, 2013-11-09 at 18:02 +0100, Bastien Nocera wrote:
>> When we return FALSE from idle handlers, the source is removed.
>> This will be causing warnings in glib 2.40.
>>
>> See https://bugzilla.gnome.org/show_bug.cgi?id=710724
>
> Note that there's plenty of other places where this should be fixed.
> I'll leave those up to somebody who doesn't get RSI ;)

Btw, did you really got a problem or was just by looking at the code?
process_changes always call remove_pending so perhaps the problem was
just in generic_unregister, so the change to process_changes was not
really necessary.

-- 
Luiz Augusto von Dentz

Re: [PATCH 1/3] gdbus: Don't try to remove removed sources

[Bastien Nocera]

On Mon, 2013-11-11 at 11:32 +0200, Luiz Augusto von Dentz wrote:
> Hi Bastien,
> 
> On Sat, Nov 9, 2013 at 7:04 PM, Bastien Nocera <hadess@hadess.net> wrote:
> > On Sat, 2013-11-09 at 18:02 +0100, Bastien Nocera wrote:
> >> When we return FALSE from idle handlers, the source is removed.
> >> This will be causing warnings in glib 2.40.
> >>
> >> See https://bugzilla.gnome.org/show_bug.cgi?id=710724
> >
> > Note that there's plenty of other places where this should be fixed.
> > I'll leave those up to somebody who doesn't get RSI ;)
> 
> Btw, did you really got a problem or was just by looking at the code?
> process_changes always call remove_pending so perhaps the problem was
> just in generic_unregister, so the change to process_changes was not
> really necessary.

I really had the problem, and the patch fixed it. Resetting the id for
idle callbacks and timeouts needs to happen at the end of each callback
function, or you might be trying to remove an invalid source ID.