diff options
author | Bastien Nocera <hadess@hadess.net> | 2013-10-26 14:52:59 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2013-10-26 14:55:15 +0200 |
commit | 6e8e659ca282dec0201a8773cd65153debea9e66 (patch) | |
tree | 876c55696e0bb678ee28931b59b4a41f4ef1f62f | |
parent | 4d0af3b31bda9270037dc18a503305fea1c5710e (diff) | |
download | upower-6e8e659ca282dec0201a8773cd65153debea9e66.tar.gz |
daemon: Better timeout source naming
Matching the work done in glib, gtk+, etc.
This also differentiates the unknown and normal timeouts in
the Linux power supply driver.
-rw-r--r-- | src/dummy/up-backend.c | 2 | ||||
-rw-r--r-- | src/freebsd/up-backend.c | 2 | ||||
-rw-r--r-- | src/linux/up-device-csr.c | 2 | ||||
-rw-r--r-- | src/linux/up-device-hid.c | 2 | ||||
-rw-r--r-- | src/linux/up-device-idevice.c | 2 | ||||
-rw-r--r-- | src/linux/up-device-supply.c | 30 | ||||
-rw-r--r-- | src/linux/up-device-unifying.c | 1 | ||||
-rw-r--r-- | src/linux/up-device-wup.c | 2 | ||||
-rw-r--r-- | src/linux/up-dock.c | 1 | ||||
-rw-r--r-- | src/up-daemon.c | 1 | ||||
-rw-r--r-- | src/up-history.c | 2 | ||||
-rw-r--r-- | src/up-main.c | 6 | ||||
-rw-r--r-- | src/up-wakeups.c | 6 |
13 files changed, 41 insertions, 18 deletions
diff --git a/src/dummy/up-backend.c b/src/dummy/up-backend.c index c752041..d9972a9 100644 --- a/src/dummy/up-backend.c +++ b/src/dummy/up-backend.c @@ -100,7 +100,7 @@ up_backend_add_cb (UpBackend *backend) /* setup poll */ timer_id = g_timeout_add_seconds (2, (GSourceFunc) up_backend_changed_time_cb, backend); - g_source_set_name_by_id (timer_id, "[UpBackend] changed"); + g_source_set_name_by_id (timer_id, "[upower] up_backend_changed_time_cb (dummy)"); out: return FALSE; } diff --git a/src/freebsd/up-backend.c b/src/freebsd/up-backend.c index 433c331..ad54b9c 100644 --- a/src/freebsd/up-backend.c +++ b/src/freebsd/up-backend.c @@ -288,7 +288,7 @@ up_backend_coldplug (UpBackend *backend, UpDaemon *daemon) g_timeout_add_seconds (UP_BACKEND_REFRESH_TIMEOUT, (GSourceFunc) up_backend_refresh_devices, backend); - g_source_set_name_by_id (backend->priv->poll_timer_id, "[FreeBSD:UpBackend] poll"); + g_source_set_name_by_id (backend->priv->poll_timer_id, "[upower] up_backend_refresh_devices (freebsd)"); return TRUE; } diff --git a/src/linux/up-device-csr.c b/src/linux/up-device-csr.c index ca6eb3d..cf2f938 100644 --- a/src/linux/up-device-csr.c +++ b/src/linux/up-device-csr.c @@ -209,7 +209,7 @@ up_device_csr_coldplug (UpDevice *device) csr->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_CSR_REFRESH_TIMEOUT, (GSourceFunc) up_device_csr_poll_cb, csr); - g_source_set_name_by_id (csr->priv->poll_timer_id, "[UpDeviceCsr] poll"); + g_source_set_name_by_id (csr->priv->poll_timer_id, "[upower] up_device_csr_poll_cb (linux)"); out: return ret; } diff --git a/src/linux/up-device-hid.c b/src/linux/up-device-hid.c index 14bbfdf..fe2c992 100644 --- a/src/linux/up-device-hid.c +++ b/src/linux/up-device-hid.c @@ -475,7 +475,7 @@ up_device_hid_init (UpDeviceHid *hid) hid->priv->fd = -1; hid->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_HID_REFRESH_TIMEOUT, (GSourceFunc) up_device_hid_poll, hid); - g_source_set_name_by_id (hid->priv->poll_timer_id, "[UpDeviceHid] poll"); + g_source_set_name_by_id (hid->priv->poll_timer_id, "[upower] up_device_hid_poll (linux)"); } /** diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c index 8e31e11..86eccf5 100644 --- a/src/linux/up-device-idevice.c +++ b/src/linux/up-device-idevice.c @@ -153,7 +153,7 @@ up_device_idevice_coldplug (UpDevice *device) idevice->priv->poll_timer_id = g_timeout_add_seconds (poll_seconds, (GSourceFunc) up_device_idevice_poll_cb, idevice); - g_source_set_name_by_id (idevice->priv->poll_timer_id, "[UpDeviceIdevice] poll"); + g_source_set_name_by_id (idevice->priv->poll_timer_id, "[upower] up_device_idevice_poll_cb (linux)"); return TRUE; out: diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c index 3a3ceea..efacc71 100644 --- a/src/linux/up-device-supply.c +++ b/src/linux/up-device-supply.c @@ -897,11 +897,17 @@ up_device_supply_refresh_device (UpDeviceSupply *supply, * up_device_supply_poll_battery: **/ static gboolean -up_device_supply_poll_battery (UpDeviceSupply *supply) +up_device_supply_poll_battery (UpDeviceSupply *supply, + guint timeout) { UpDevice *device = UP_DEVICE (supply); - g_debug ("No updates on supply %s for %i seconds; forcing update", up_device_get_object_path (device), UP_DEVICE_SUPPLY_REFRESH_TIMEOUT); + if (timeout == UP_DEVICE_SUPPLY_UNKNOWN_TIMEOUT) + g_debug ("Unknown state on supply %s; forcing update after %i seconds", + up_device_get_object_path (device), timeout); + else + g_debug ("No updates on supply %s for %i seconds; forcing update", + up_device_get_object_path (device), timeout); supply->priv->poll_timer_id = 0; up_device_supply_refresh (device); @@ -909,6 +915,18 @@ up_device_supply_poll_battery (UpDeviceSupply *supply) return FALSE; } +static gboolean +up_device_supply_poll_battery_normal (UpDeviceSupply *supply) +{ + return up_device_supply_poll_battery (supply, UP_DEVICE_SUPPLY_REFRESH_TIMEOUT); +} + +static gboolean +up_device_supply_poll_unknown_battery (UpDeviceSupply *supply) +{ + return up_device_supply_poll_battery (supply, UP_DEVICE_SUPPLY_UNKNOWN_TIMEOUT); +} + /** * up_device_supply_coldplug: * @@ -1061,8 +1079,8 @@ up_device_supply_setup_poll (UpDevice *device, supply->priv->unknown_retries < UP_DEVICE_SUPPLY_UNKNOWN_RETRIES) { supply->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_SUPPLY_UNKNOWN_TIMEOUT, - (GSourceFunc) up_device_supply_poll_battery, supply); - g_source_set_name_by_id (supply->priv->poll_timer_id, "[UpDeviceSupply] unknown poll"); + (GSourceFunc) up_device_supply_poll_unknown_battery, supply); + g_source_set_name_by_id (supply->priv->poll_timer_id, "[upower] up_device_supply_poll_unknown_battery (linux)"); /* increase count, we don't want to poll at 0.5Hz forever */ supply->priv->unknown_retries++; @@ -1072,8 +1090,8 @@ up_device_supply_setup_poll (UpDevice *device, /* any other state just fall back */ supply->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_SUPPLY_REFRESH_TIMEOUT, - (GSourceFunc) up_device_supply_poll_battery, supply); - g_source_set_name_by_id (supply->priv->poll_timer_id, "[UpDeviceSupply] normal poll"); + (GSourceFunc) up_device_supply_poll_battery_normal, supply); + g_source_set_name_by_id (supply->priv->poll_timer_id, "[upower] up_device_supply_poll_battery_normal (linux)"); out: return (supply->priv->poll_timer_id != 0); } diff --git a/src/linux/up-device-unifying.c b/src/linux/up-device-unifying.c index b2a9f12..5639366 100644 --- a/src/linux/up-device-unifying.c +++ b/src/linux/up-device-unifying.c @@ -292,6 +292,7 @@ up_device_unifying_coldplug (UpDevice *device) unifying->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_UNIFYING_REFRESH_TIMEOUT, (GSourceFunc) up_device_unifying_refresh, device); + g_source_set_name_by_id (unifying->priv->poll_timer_id, "[upower] up_device_unifying_refresh (linux)"); ret = TRUE; out: g_list_foreach (hidraw_list, (GFunc) g_object_unref, NULL); diff --git a/src/linux/up-device-wup.c b/src/linux/up-device-wup.c index 6f1d3f7..b2f5c96 100644 --- a/src/linux/up-device-wup.c +++ b/src/linux/up-device-wup.c @@ -426,7 +426,7 @@ up_device_wup_init (UpDeviceWup *wup) wup->priv->fd = -1; wup->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_WUP_REFRESH_TIMEOUT, (GSourceFunc) up_device_wup_poll_cb, wup); - g_source_set_name_by_id (wup->priv->poll_timer_id, "[UpDeviceWup] poll"); + g_source_set_name_by_id (wup->priv->poll_timer_id, "[upower] up_device_wup_poll_cb (linux)"); } /** diff --git a/src/linux/up-dock.c b/src/linux/up-dock.c index 78fb7d3..014b42e 100644 --- a/src/linux/up-dock.c +++ b/src/linux/up-dock.c @@ -113,6 +113,7 @@ up_dock_set_should_poll (UpDock *dock, gboolean should_poll) dock->priv->poll_id = g_timeout_add_seconds (UP_DOCK_POLL_TIMEOUT, (GSourceFunc) up_dock_poll_cb, dock); + g_source_set_name_by_id (dock->priv->poll_id, "[upower] up_dock_poll_cb (linux)"); } else if (dock->priv->poll_id > 0) { g_source_remove (dock->priv->poll_id); dock->priv->poll_id = 0; diff --git a/src/up-daemon.c b/src/up-daemon.c index f0a9451..3a81813 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -770,6 +770,7 @@ up_daemon_set_warning_level (UpDaemon *daemon, UpDeviceLevel warning_level) daemon->priv->action_timeout_id = g_timeout_add_seconds (UP_DAEMON_ACTION_DELAY, (GSourceFunc) take_action_timeout_cb, daemon); + g_source_set_name_by_id (daemon->priv->action_timeout_id, "[upower] take_action_timeout_cb"); } else { g_debug ("Not taking action, timeout id already set"); } diff --git a/src/up-history.c b/src/up-history.c index 1751948..f9d0fdf 100644 --- a/src/up-history.c +++ b/src/up-history.c @@ -652,7 +652,7 @@ up_history_schedule_save (UpHistory *history) g_debug ("saving in %i seconds", UP_HISTORY_SAVE_INTERVAL); history->priv->save_id = g_timeout_add_seconds (UP_HISTORY_SAVE_INTERVAL, (GSourceFunc) up_history_schedule_save_cb, history); - g_source_set_name_by_id (history->priv->save_id, "[UpHistory] save"); + g_source_set_name_by_id (history->priv->save_id, "[upower] up_history_schedule_save_cb"); return TRUE; } diff --git a/src/up-main.c b/src/up-main.c index de6dc12..c27cfb4 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -267,12 +267,14 @@ main (gint argc, gchar **argv) /* only timeout and close the mainloop if we have specified it on the command line */ if (timed_exit) { timer_id = g_timeout_add_seconds (30, (GSourceFunc) up_main_timed_exit_cb, loop); - g_source_set_name_by_id (timer_id, "[UpMain] idle"); + g_source_set_name_by_id (timer_id, "[upower] up_main_timed_exit_cb"); } /* immediatly exit */ - if (immediate_exit) + if (immediate_exit) { g_timeout_add (50, (GSourceFunc) up_main_timed_exit_cb, loop); + g_source_set_name_by_id (timer_id, "[upower] up_main_timed_exit_cb"); + } /* wait for input or timeout */ g_main_loop_run (loop); diff --git a/src/up-wakeups.c b/src/up-wakeups.c index ee7368a..a0719e1 100644 --- a/src/up-wakeups.c +++ b/src/up-wakeups.c @@ -634,7 +634,7 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups) wakeups->priv->disable_id = g_timeout_add_seconds (UP_WAKEUPS_DISABLE_INTERVAL, (GSourceFunc) up_wakeups_disable_cb, wakeups); - g_source_set_name_by_id (wakeups->priv->disable_id, "[UpWakeups] disable"); + g_source_set_name_by_id (wakeups->priv->disable_id, "[upower] up_wakeups_disable_cb"); /* already same state */ if (wakeups->priv->polling_enabled) @@ -646,12 +646,12 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups) wakeups->priv->poll_kernel_id = g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL, (GSourceFunc) up_wakeups_poll_kernel_cb, wakeups); - g_source_set_name_by_id (wakeups->priv->poll_kernel_id, "[UpWakeups] kernel"); + g_source_set_name_by_id (wakeups->priv->poll_kernel_id, "[upower] up_wakeups_poll_kernel_cb"); wakeups->priv->poll_userspace_id = g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_USERSPACE, (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups); - g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[UpWakeups] userspace"); + g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb"); file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w"); if (file == NULL) |