Mir

Merge lp://qastaging/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2 into lp://qastaging/mir

port-input-dispatcher-to-input-sender-take-2
Merge into development-branch

Proposed by Robert Carr on 2015-04-01

Status:	Work in progress
Proposed branch:	lp://qastaging/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2
Merge into:	lp://qastaging/mir
Diff against target:	23 lines (+1/-3) 1 file modified src/server/input/android/input_sender.cpp (+1/-3)
To merge this branch:	bzr merge lp://qastaging/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-04-01	Needs Fixing on 2015-04-02
Alexandros Frantzis		2015-04-01	Pending
Alan Griffiths		2015-04-01	Pending
Andreas Pokorny		2015-04-01	Pending
Kevin DuBois		2015-04-01	Pending
Daniel van Vugt		2015-04-01	Pending
Review via email: mp+255026@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-03-16.

Description of the change

Port the InputDispatcher to use the InputSender. This enables use of Surface::consume concurrently with droidinput::InputDispatcher (as things stand InputDispatcher would become confused by seq ids).

Dispatcher becomes the InputSendObserver (in order to receive finished signals, etc...the most hairy part of this diff) and accesses the input sender through new methods on droidinput::WindowHandle

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-17: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-17: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-03-19: Posted in a previous version of this proposal

Thanks for boy scouting my typos @1093

+698 stray n

will have another run over it in a bit..

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-03-19: Posted in a previous version of this proposal

ok looks good apart from the stray n.

review: Approve

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-03-19: Posted in a previous version of this proposal

okay, few other strays
428 +
1059 +
1287 +
1328 +

review: Approve

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-03-19: Posted in a previous version of this proposal

Strays cleaned up.

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-03-19: Posted in a previous version of this proposal

Thanks :)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2383
http://jenkins.qa.ubuntu.com/job/mir-ci/3286/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1721/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1720/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1674/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1674/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-03-20: Posted in a previous version of this proposal

OK (besides the CI failures, of course).

Nits:

169 + { // acquire lock
170 + AutoMutex _l(mLock);

193 + { // acquire lock
194 + AutoMutex _l(mLock);

The locking scheme would be more clear if the code was indented.

146 +void InputDispatcher::handleEventSendStatusLocked(uint32_t seq, sp<Connection> connection, bool success, bool handled, bool socket_dead)

Clearer with enums instead of bools, or even named variables at the call site (e.g. handleEventSendStatusLocked(..., failure, not_handled, socket_not_dead)).

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-23: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2390
http://jenkins.qa.ubuntu.com/job/mir-ci/3327/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1777/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1776
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1728/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1324/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1728/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-25: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-25: Posted in a previous version of this proposal

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1255/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1809
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1760/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/435/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1760
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1760/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4722/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19133

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-03-25: Posted in a previous version of this proposal

Looks like slow CI infrastructure - re-TAing

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-03-25: Posted in a previous version of this proposal

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-03-26: Posted in a previous version of this proposal

Sorry, I had to revert the landing as a quick fix for bug 1436644. Please fix and resubmit.

review: Needs Resubmitting

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-03-26: Posted in a previous version of this proposal

Thanks Daniel I think I've located the deadlock (I seem to have introduced it in some last minute cleanup lol...) now auditing though I've found (and perhaps fixed) a second rarer one (e.g. 1 per 5000 test case). More soon

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-27: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2393
http://jenkins.qa.ubuntu.com/job/mir-ci/3389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1855
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1854/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1805/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-03-27: Posted in a previous version of this proposal

You will probably need to resubmit under a different branch name. Bzr remembers merging it in the past so won't show any/much diff needs merging.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-03-27: Posted in a previous version of this proposal

> You will probably need to resubmit under a different branch name. Bzr
> remembers merging it in the past so won't show any/much diff needs merging.

Or merge lp:mir and revert the revert

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-02:

FAILED: Continuous integration, rev:2393
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2/+merge/255026/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/3432/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1923/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1873/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1873/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2 updated on 2015-04-02

2394. By Robert Carr on 2015-04-02: Merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-02:

FAILED: Continuous integration, rev:2394
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2/+merge/255026/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/3445/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1941
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1940/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1891/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1891/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

2394. By Robert Carr on 2015-04-02: Merge trunk
2393. By Robert Carr on 2015-03-26: Typo
2392. By Robert Carr on 2015-03-26: Only enqueue entry in transfer ctopr to avoid re subscribing to dieing transfers

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Mir development team

Mir

Merge lp://qastaging/~mir-team/mir/port-input-dispatcher-to-input-sender-take-2 into lp://qastaging/mir

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers