fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-04-23 14:30:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: only reset poll if warning-level changed

Browse source 
When a device is refreshed because the poll timeout has been reached,
the warning-level change notification can also be fired, which then
will reset (i.e. disable, re-enable) polling. For batteries this can
happen three times in a row.
Now we reset polling only if the calculated timeout actually differs
from the current one.

https://bugs.freedesktop.org/show_bug.cgi?id=99862
This commit is contained in:
Christian Kellner 2017-02-22 17:37:14 +01:00 • committed by Bastien Nocera
parent fb9f19c3b5
commit 924b42e4f8
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/up-daemon.c
View file

@ -76,6 +76,8 @@ static gboolean up_daemon_get_on_battery_local (UpDaemon *daemon);
static gboolean up_daemon_get_warning_level_local(UpDaemon *daemon);
static gboolean up_daemon_get_on_ac_local (UpDaemon *daemon);
static guint calculate_timeout (UpDevice *device);
G_DEFINE_TYPE (UpDaemon, up_daemon, UP_TYPE_EXPORTED_DAEMON_SKELETON)
#define UP_DAEMON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_DAEMON, UpDaemonPrivate))
@ -734,14 +736,27 @@ change_idle_timeout (UpDevice *device,
TimeoutData *data;
GSourceFunc callback;
UpDaemon *daemon;
guint timeout;
daemon = up_device_get_daemon (device);
data = g_hash_table_lookup (daemon->priv->poll_timeouts, device);
callback = data->callback;
up_daemon_stop_poll (G_OBJECT (device));
up_daemon_start_poll (G_OBJECT (device), callback);
g_debug ("change_idle_timeout called for: %s",
up_device_get_object_path (device));
timeout = calculate_timeout (device);
if (timeout != data->timeout) {
g_debug ("Resetting for polling for '%s' (warning-level change)",
up_device_get_object_path (device));
data->timeout = timeout;
up_daemon_stop_poll (G_OBJECT (device));
up_daemon_start_poll (G_OBJECT (device), callback);
}
g_object_unref (daemon);
}