Merge lp:~vanvugt/qtmir/deepsleep into lp:qtmir

[Daniel van Vugt]

Stop waking up every 200ms if there's nothing to wake up for.
It's just wasting battery.

This solves at least half of LP: #1479250. Although the regular
wakeup problem is solved by this, Unity8 continues to use noticeable
CPU while idle (obviously in much less frequent intervals now).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:367
http://jenkins.qa.ubuntu.com/job/qtmir-ci/381/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/114/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~vanvugt/qtmir/deepsleep]

368. By Daniel van Vugt on 2015-08-31

Merge latest trunk and fix massive conflicts :(

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:368
http://jenkins.qa.ubuntu.com/job/qtmir-ci/384/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/117/console

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

review: Needs Fixing (continuous-integration)

[lp:~vanvugt/qtmir/deepsleep]

369. By Daniel van Vugt on 2015-09-08

Ping Jenkins

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:369
http://jenkins.qa.ubuntu.com/job/qtmir-ci/402/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/135/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Makes sense, and I am not seeing any visual impact. Approved

review: Approve

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-08-26 11:38:50 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-09-08 06:12:34 +0000
@@ -280,6 +280,12 @@
             << "buffer dropped."
             << framesPending-1
             << "left.";
+    } else {
+        // The client can't possibly be blocked in swap buffers if the
+        // queue is empty. So we can safely enter deep sleep now. If the
+        // client provides any new frames, the timer will get restarted
+        // via scheduleTextureUpdate()...
+        m_frameDropperTimer.stop();
     }
 }