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

[Alberto Aguirre]

Attempt to sync up sys state when powerd is already up (LP: #1343919)

Attempt to sync up sys state when powerd is already up (LP: #1343919)

powerd does not expose a system state query api - as a workaround the PowerdMediator constructor can issue a request for active state if the powerd interface is already up, but doesn't wait for the state change, it assumes it will be active at some point (if not already active).

There is a potential small race between powerd signaling the system to fully come out of suspend and turning the screen on so powering the screen may fail ((I have not seen this behavior so far however). In any case a press of the power key should bring the screen back up, as the powerd state and PowerdMediator will now be sync'd up.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good and works well (tested on N4).

review: Approve

=== modified file 'src/powerd_mediator.cpp'
--- src/powerd_mediator.cpp	2014-07-15 19:52:21 +0000
+++ src/powerd_mediator.cpp	2014-07-21 22:19:19 +0000
@@ -80,10 +80,6 @@
 {
     qDBusRegisterMetaType<BrightnessParams>();
 
-    if (powerd_interface->isValid())
-    {
-        init_brightness_params();
-    }
     //Powerd interface may not be available right now or it may restart in the future
     //watch for changes so brightness params get initialized to the most recent values.
     connect(service_watcher.get(),
@@ -96,6 +92,19 @@
                                            "SysPowerStateChange",
                                            this,
                                            SLOT(powerd_state_changed(int)));
+
+    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())
+            system_state = active;
+    }
 }
 
 PowerdMediator::~PowerdMediator() = default;
@@ -204,16 +213,23 @@
 
 void PowerdMediator::disable_suspend()
 {
+    if (disable_suspend_request())
+        wait_for_state(active);
+}
+
+bool PowerdMediator::disable_suspend_request()
+{
     if (!acquired_sys_state)
     {
         QDBusReply<QString> reply = powerd_interface->call("requestSysState", "com.canonical.Unity.Screen", 1);
         if (reply.isValid())
         {
             sys_state_cookie = reply.value();
-            wait_for_state(active);
             acquired_sys_state = true;
+            return true;
         }
     }
+    return false;
 }
 
 void PowerdMediator::init_brightness_params()

=== modified file 'src/powerd_mediator.h'
--- src/powerd_mediator.h	2014-07-15 19:52:21 +0000
+++ src/powerd_mediator.h	2014-07-21 22:19:19 +0000
@@ -76,6 +76,7 @@
     };
     void change_backlight_state(BacklightState state);
     void init_brightness_params();
+    bool disable_suspend_request();
     void wait_for_state(SystemState state);
 
     int dim_brightness;