Merge lp:~phablet-team/powerd/power-block-reboot into lp:powerd

[Ricardo Mendoza]

Watch com.canonical.Unity.Screen vanishing from the bus (USC/Unity8 not running) to hold a lock until either we poweroff, or Unity returns. Also, add a delay for clearing requests from dead bus names (LP: #1452300)

[lp:~phablet-team/powerd/power-block-reboot]

164. By Ricardo Mendoza on 2015-05-07

Remove debug

165. By Ricardo Mendoza on 2015-05-07

Wrong name

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/powerd-ci/177/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/177/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks good, works as expected. Thanks!

review: Approve

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2015-04-30 17:18:58 +0000
+++ src/powerd-object.c	2015-05-07 20:32:36 +0000
@@ -406,13 +406,19 @@
     *proxy = unity_proxy;
 }
 
+static gboolean delayed_clear_request(gpointer userdata)
+{
+    clear_sys_state_by_owner((gchar*) userdata);
+    return FALSE;
+}
+
 void
 powerd_name_vanished_cb(GDBusConnection *connection,
                         const gchar *name,
                         gpointer user_data)
 {
     powerd_warn("%s vanished from dbus, clearing associated requests", name);
-    clear_sys_state_by_owner(name);
+    g_timeout_add(5000, delayed_clear_request, (gpointer) name);
     powerd_client_unregister(name);
     // This can return false if the hash entry was removed because the
     // last request was dropped, in other words, this call will fail

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-10-24 23:52:09 +0000
+++ src/powerd.cpp	2015-05-07 20:32:36 +0000
@@ -60,6 +60,8 @@
 
 static int call_added = 0;
 
+static uuid_t screen_cookie;
+
 /* Used to track modem interfaces */
 struct modem_data {
     char *obj_name;
@@ -331,6 +333,29 @@
     }
 }
 
+void
+unity_screen_name_appeared_cb(GDBusConnection *connection,
+                              const gchar *name,
+                              gpointer user_data)
+{
+    if (!uuid_is_null(screen_cookie)) {
+        clear_sys_state_internal(screen_cookie);
+        uuid_clear(screen_cookie);
+    }
+}
+
+void
+unity_screen_name_vanished_cb(GDBusConnection *connection,
+                              const gchar *name,
+                              gpointer user_data)
+{
+    if (uuid_is_null(screen_cookie)) {
+        request_sys_state_internal("shutdown-request",
+                                  POWERD_SYS_STATE_ACTIVE,
+                                  &screen_cookie, NULL);
+    }
+}
+
 /* Must be first to run on main loop */
 static gboolean main_init(gpointer unused)
 {
@@ -409,6 +434,16 @@
                 (GAsyncReadyCallback) unity_proxy_connect_cb,
                 &g_unity_proxy);
 
+    /* Initialize screen cookie before setting up listener */
+    uuid_clear(screen_cookie);
+
+    /* Register for com.canonical.Unity.Screen name ownership changes */
+    g_bus_watch_name(G_BUS_TYPE_SYSTEM, "com.canonical.Unity.Screen",
+            G_BUS_NAME_WATCHER_FLAGS_NONE,
+            (GBusNameAppearedCallback)unity_screen_name_appeared_cb,
+            (GBusNameVanishedCallback)unity_screen_name_vanished_cb,
+            NULL, NULL);
+
     /* Init this first, data is used by other inits */
     device_config_init();