Merge lp:~albaguirre/unity-system-compositor/fix-1353647 into lp:unity-system-compositor

[Alberto Aguirre]

Request disabling of system suspend on first boot or when powerd restarts (if needed)

Request disabling of system suspend on first boot or when powerd restarts (if needed)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/141/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks okay to me

review: Approve

[Kevin DuBois (kdub)]

> looks okay to me
some tests would be good, but I'm unfamiliar with how hard/easy this is to do in usc.

[lp:~albaguirre/unity-system-compositor/fix-1353647]

165. By Alberto Aguirre on 2014-08-14

Merge lp:unity-system-compositor

166. By Alberto Aguirre on 2014-08-14

Simplify changes

[Michael Terry (mterry)]

LGTM too

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/146/rebuild

review: Approve (continuous-integration)

=== modified file 'src/powerd_mediator.cpp'
--- src/powerd_mediator.cpp	2014-07-21 21:54:19 +0000
+++ src/powerd_mediator.cpp	2014-08-14 18:06:35 +0000
@@ -71,7 +71,7 @@
       auto_brightness_supported_{false},
       auto_brightness_requested{false},
       backlight_state{BacklightState::normal},
-      acquired_sys_state{false},
+      pending_suspend_blocker_request{true},
       powerd_interface{new QDBusInterface("com.canonical.powerd",
           "/com/canonical/powerd", "com.canonical.powerd", QDBusConnection::systemBus())},
       service_watcher{new QDBusServiceWatcher("com.canonical.powerd",
@@ -96,14 +96,18 @@
     if (powerd_interface->isValid())
     {
         init_brightness_params();
-        //If powerd is already up it may already be in the active state
-        //and the SysPowerStateChange signal could have already been broadcasted
-        //before we got a chance to register a listener for it.
-        //We will assume that if the active request succeeds that the system state
-        //will become active at some point in the future - this is only a workaround
-        //for the lack of a system state query api in powerd
-        if (disable_suspend_request())
+        if (request_suspend_blocker())
+        {
+            /*
+             * If powerd is already up it may already be in the active state
+             * and the SysPowerStateChange signal could have already been broadcasted
+             * before we got a chance to register a listener for it.
+             * We will assume that if the active request succeeds that the system state
+             * will become active at some point in the future - this is only a workaround
+             * for the lack of a system state query api in powerd
+             */
             system_state = active;
+        }
     }
 }
 
@@ -162,6 +166,24 @@
 void PowerdMediator::powerd_registered()
 {
     init_brightness_params();
+
+    /* A suspend block request needs to be issued here on the following scenarios:
+     * 1. powerd has restarted and PowerdMediator had already issued a request
+     *    to the previous powerd instance
+     * 2. When booting up the screen is assumed to be on and consequently we need to also issue
+     *    a system suspend block request.
+     * 3. If powerd interface is not available yet, but the screen had been turned on
+     *    then now is the time to issue the request
+     */
+    if (!suspend_block_cookie.isEmpty() || pending_suspend_blocker_request)
+    {
+        //Clear the previous cookie as powerd has restarted anyway
+        suspend_block_cookie.clear();
+        request_suspend_blocker();
+    }
+
+    //Powerd may have restarted, re-apply backlight settings
+    change_backlight_state(backlight_state, true);
 }
 
 void PowerdMediator::set_brightness(int brightness)
@@ -172,9 +194,9 @@
         powerd_interface->call("setUserBrightness", brightness);
 }
 
-void PowerdMediator::change_backlight_state(BacklightState new_state)
+void PowerdMediator::change_backlight_state(BacklightState new_state, bool force_change)
 {
-    if (backlight_state == new_state)
+    if (backlight_state == new_state && !force_change)
         return;
 
     if (new_state == BacklightState::automatic)
@@ -206,28 +228,36 @@
 
 void PowerdMediator::allow_suspend()
 {
-    if (acquired_sys_state)
-        powerd_interface->call("clearSysState", sys_state_cookie);
-    acquired_sys_state = false;
+    if (!suspend_block_cookie.isEmpty())
+    {
+        powerd_interface->call("clearSysState", suspend_block_cookie);
+        suspend_block_cookie.clear();
+    }
+    pending_suspend_blocker_request = false;
 }
 
 void PowerdMediator::disable_suspend()
 {
-    if (disable_suspend_request())
+    if (request_suspend_blocker())
         wait_for_state(active);
 }
 
-bool PowerdMediator::disable_suspend_request()
+bool PowerdMediator::request_suspend_blocker()
 {
-    if (!acquired_sys_state)
+    if (suspend_block_cookie.isEmpty())
     {
         QDBusReply<QString> reply = powerd_interface->call("requestSysState", "com.canonical.Unity.Screen", 1);
         if (reply.isValid())
         {
-            sys_state_cookie = reply.value();
-            acquired_sys_state = true;
+            suspend_block_cookie = reply.value();
+            pending_suspend_blocker_request = false;
             return true;
         }
+        else
+        {
+            //Powerd may not yet be available, so save the pending request
+            pending_suspend_blocker_request = true;
+        }
     }
     return false;
 }

=== modified file 'src/powerd_mediator.h'
--- src/powerd_mediator.h	2014-07-21 21:54:19 +0000
+++ src/powerd_mediator.h	2014-08-14 18:06:35 +0000
@@ -74,9 +74,9 @@
         suspended = 0,
         active,
     };
-    void change_backlight_state(BacklightState state);
+    void change_backlight_state(BacklightState state, bool force_change = false);
     void init_brightness_params();
-    bool disable_suspend_request();
+    bool request_suspend_blocker();
     void wait_for_state(SystemState state);
 
     int dim_brightness;
@@ -88,8 +88,8 @@
     bool auto_brightness_requested;
     BacklightState backlight_state;
 
-    QString sys_state_cookie;
-    bool acquired_sys_state;
+    QString suspend_block_cookie;
+    bool pending_suspend_blocker_request;
 
     std::unique_ptr<QDBusInterface> powerd_interface;
     std::unique_ptr<QDBusServiceWatcher> service_watcher;