Attachment 109654 Details for Bug 82659 – daemon: properly disconnect signals, stop memleak

[patch] daemon: properly disconnect signals, stop memleak

0001-daemon-properly-disconnect-signals-stop-memleak.patch (text/plain), 3.10 KB, created by Peter Wu on 2014-11-18 06:00:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Wu

Created: 2014-11-18 06:00:47 UTC

Size: 3.10 KB

patch

obsolete

>From 28ca91e56fe5738941d209f6297cab24760c7421 Mon Sep 17 00:00:00 2001
>From: Peter Wu <peter@lekensteyn.nl>
>Date: Tue, 18 Nov 2014 06:04:08 +0100
>Subject: [PATCH] daemon: properly disconnect signals, stop memleak
>
>Whenever the daemon is polling on a device, a new signal is connected to
>the object. This signal was not disconnected when polling stops which
>resulted in a memory leak. Furthermore, whenever the "warning-level"
>property is updated, the signal would result in an exponentially raising
>call count (this happens when the battery percentage changes for
>example).
>
>https://bugs.freedesktop.org/show_bug.cgi?id=82659
>
>Reported-by: Alexander Jesner <alexander@jesner.eu>
>Signed-off-by: Peter Wu <peter@lekensteyn.nl>
>---
> src/up-daemon.c | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
>diff --git a/src/up-daemon.c b/src/up-daemon.c
>index 86eb3c9..351582e 100644
>--- a/src/up-daemon.c
>+++ b/src/up-daemon.c
>@@ -69,6 +69,7 @@ struct UpDaemonPrivate
> 	UpDeviceList		*power_devices;
> 	guint			 action_timeout_id;
> 	GHashTable		*poll_timeouts;
>+	GHashTable		*idle_signals;
> 
> 	/* Properties */
> 	gboolean		 on_battery;
>@@ -945,6 +946,7 @@ up_daemon_start_poll (GObject     *object,
> 	UpDevice *device;
> 	TimeoutData *data;
> 	guint timeout;
>+	ulong handler_id;
> 	char *name;
> 
> 	device = UP_DEVICE (object);
>@@ -962,8 +964,10 @@ up_daemon_start_poll (GObject     *object,
> 	timeout = calculate_timeout (device);
> 	data->timeout = timeout;
> 
>-	g_signal_connect (device, "notify::warning-level",
>-			  G_CALLBACK (change_idle_timeout), NULL);
>+	handler_id = g_signal_connect (device, "notify::warning-level",
>+				       G_CALLBACK (change_idle_timeout), NULL);
>+	g_hash_table_insert (daemon->priv->idle_signals, device,
>+			     GUINT_TO_POINTER (handler_id));
> 	g_object_weak_ref (object, device_destroyed, daemon);
> 
> 	data->id = g_timeout_add_seconds (timeout, fire_timeout_callback, device);
>@@ -984,10 +988,20 @@ up_daemon_stop_poll (GObject *object)
> 	UpDevice *device;
> 	TimeoutData *data;
> 	UpDaemon *daemon;
>+	gpointer value;
>+	gulong handle_id;
> 
> 	device = UP_DEVICE (object);
> 	daemon = up_device_get_daemon (device);
> 
>+	value = g_hash_table_lookup (daemon->priv->idle_signals, device);
>+	if (value != NULL) {
>+		handle_id = GPOINTER_TO_UINT (value);
>+		if (g_signal_handler_is_connected (device, handle_id))
>+			g_signal_handler_disconnect (device, handle_id);
>+		g_hash_table_remove (daemon->priv->idle_signals, device);
>+	}
>+
> 	data = g_hash_table_lookup (daemon->priv->poll_timeouts, device);
> 	if (data == NULL)
> 		return;
>@@ -1133,6 +1147,7 @@ up_daemon_init (UpDaemon *daemon)
> 
> 	daemon->priv->poll_timeouts = g_hash_table_new_full (g_direct_hash, g_direct_equal,
> 							     NULL, g_free);
>+	daemon->priv->idle_signals = g_hash_table_new (g_direct_hash, g_direct_equal);
> }
> 
> /**
>@@ -1277,6 +1292,7 @@ up_daemon_finalize (GObject *object)
> 		g_source_remove (priv->props_idle_id);
> 
> 	g_clear_pointer (&priv->poll_timeouts, g_hash_table_destroy);
>+	g_clear_pointer (&priv->idle_signals, g_hash_table_destroy);
> 
> 	g_clear_pointer (&daemon->priv->changed_props, g_hash_table_unref);
> 	if (priv->proxy != NULL)
>-- 
>2.1.2
>

Actions: View | Splinter Review

Attachments on bug 82659: 104677 | 105167 | 105168 | 105169 | 105170 | 109654 | 110418

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.