Unity System Compositor

Merge lp://qastaging/~afrantzis/unity-system-compositor/fix-1485737-notification-with-inactivity-zero into lp://qastaging/unity-system-compositor

fix-1485737-notification-with-inactivity-zero
Merge into trunk

Proposed by Alexandros Frantzis on 2015-08-18

Status:

Merged

Approved by:

Alexandros Frantzis on 2015-08-21

Approved revision:

247

Merged at revision:

244

Proposed branch:

lp://qastaging/~afrantzis/unity-system-compositor/fix-1485737-notification-with-inactivity-zero

Merge into:

lp://qastaging/unity-system-compositor

Diff against target:

84 lines (+59/-0)

2 files modified

src/mir_screen.cpp (+10/-0)
tests/unit-tests/test_mir_screen.cpp (+49/-0)

To merge this branch:

bzr merge lp://qastaging/~afrantzis/unity-system-compositor/fix-1485737-notification-with-inactivity-zero

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-08-18
Michael Terry (community)		2015-08-18	Approve on 2015-08-18
Mir development team		2015-08-18	Pending
Review via email: mp+268294@code.qastaging.launchpad.net

Commit message

Cancel active timeouts and ignore notification timeouts when inactivity timeouts are zero (LP: #1485737)

Description of the change

Cancel active timeouts and ignore notification timeouts when inactivity timeouts are zero (LP: #1485737)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-18:

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/259/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/47

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-18:

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/48

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

review: Approve (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2015-08-18:

Thanks for taking this branch over for me while I was EOD! :) Efficient.

Instead of directly comparing timeouts_inactivity (and making adding more timeout types even more complicated), might this be more generic if in the new "else" case we did:

else
{
power_off_alarm->cancel();
next_power_off = mir::time::Timestamp::max;
}

Instead of {}. This way, when a notification happens, the "new_next_power_off > next_power_off" check won't override the inactivity "never" timeout. But inactivity will still be turned off when the screen is manually turned off (as we do a next_power_off = {} when cancelling timers).

And of course the same for the dimmer logic.

Then we can drop all the extra if logic in this branch, I think?

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-18:

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/49