Mir

Merge lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223 into lp://qastaging/mir

  1. prerequsites-for-fixing-1483223
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223
Merge into: lp://qastaging/mir
Diff against target: 266 lines (+96/-45)
9 files modified
include/common/mir/terminate_with_current_exception.h (+8/-3)
src/common/CMakeLists.txt (+3/-0)
src/common/symbols.map (+27/-0)
src/common/terminate_with_current_exception.cpp (+54/-0)
src/common/udev/CMakeLists.txt (+2/-2)
src/platform/CMakeLists.txt (+0/-2)
src/platform/symbols.map (+0/-18)
src/server/run_mir.cpp (+2/-19)
src/server/symbols.map (+0/-1)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223
Reviewer Review Type Date Requested Status
Daniel van Vugt Needs Fixing
Kevin DuBois (community) Approve
Cemil Azizoglu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+267580@code.qastaging.launchpad.net

Commit message

Move entry points used by android-input-static into mircommon

In part this is to see whether the team thinks moving the code like this is justified to resolve the android-input-static dependencies properly.

Description of the change

Move entry points used by android-input-static into mircommon

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2833
http://jenkins.qa.ubuntu.com/job/mir-ci/4519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3470
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1002
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3418/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/668
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3418
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3418/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6204/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22437

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

That usage of mir::udev::Monitor should be gone as soon as we move evdev related input handling to input platforms. Then it being in mirplatform should not cause problems?

Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

(1) This is still series 0.16 we're on, not 0.17:
8 -set(MIR_VERSION_MINOR 16) # This should change at least with every MIRSERVER_ABI
9 +set(MIR_VERSION_MINOR 17) # This should change at least with every MIRSERVER_ABI

review: Needs Fixing
Reply
lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223 updated
2834. By Alan Griffiths

Fix thinko (we're still on 0.16)

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

(1) Thanks.

(2) Udev enumeration feels like something that should only live in the server. Putting it in libmircommon means we're bloating every client with code it will never use. Is that right? Is it just the lesser evil?

review: Needs Information
Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

(3) src/server/symbols.map: MIR_SERVER_33 should be 34

review: Needs Fixing
Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> (2) Udev enumeration feels like something that should only live in the server.
> Putting it in libmircommon means we're bloating every client with code it will
> never use. Is that right? Is it just the lesser evil?

I think Andreas is right that it /belongs/ in an input platform library. But that's not where the input code that uses it is currently linked.

The alternative to this is therefore to clean up the input stack so that chunks are not linked into mirclient. (I hope this is what will happen naturally with the other input platform work.)

Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2834
http://jenkins.qa.ubuntu.com/job/mir-ci/4525/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3479
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/674
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3427
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6214
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22457

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

review: Approve (continuous-integration)
Reply
lp://qastaging/~alan-griffiths/mir/prerequsites-for-fixing-1483223 updated
2835. By Alan Griffiths

Revert libmirserver soname bump

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2835
http://jenkins.qa.ubuntu.com/job/mir-ci/4528/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3483
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/677
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3431
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6216
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22460

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> I think Andreas is right that it /belongs/ in an input platform library. But..

+1

review: Approve
Reply
Revision history for this message
Kevin DuBois (kdub) wrote :

iirc, mesa uses udev to figure out appropriate devices, so probably can't be isolated to an input platform.

Reply
Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

(3) The mirserver ABI bump to 34 was correct. You can't remove a function from an ABI without declaring a breakage (bump). So we need to bump it, if not here then immediately after this lands.

review: Needs Fixing
Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^ because:

256 === modified file 'src/server/symbols.map'
257 --- src/server/symbols.map 2015-07-25 08:10:48 +0000
258 +++ src/server/symbols.map 2015-08-11 10:20:04 +0000
259 @@ -286,7 +286,6 @@
260 mir::shell::WindowManager::operator*;
261 mir::shell::WindowManager::?WindowManager*;
262 mir::shell::WindowManager::WindowManager*;
263 - mir::terminate_with_current_exception*;
264 mir::time::Alarm::?Alarm*;
265 mir::time::Alarm::Alarm*;
266 mir::time::AlarmFactory::?AlarmFactory*;

Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Moved this series to WIP as I now think there's a better order in which to tackle things.

Reply

Unmerged revisions

2835. By Alan Griffiths

Revert libmirserver soname bump

2834. By Alan Griffiths

Fix thinko (we're still on 0.16)

2833. By Alan Griffiths

mirserver ABI break - bump the soname

2832. By Alan Griffiths

mirserver ABI break - bump the soname

2831. By Alan Griffiths

Fix symbol versioning in mircommon

2830. By Alan Griffiths

Move mir::udev to common

2829. By Alan Griffiths

remove terminate_with_current_exception() from server symbols

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