Mir

Merge lp:~mir-team/mir/server-platform-probing into lp:mir

server-platform-probing
Merge into development-branch

Proposed by Andreas Pokorny on 2014-12-17

Status:	Merged
Merged at revision:	2254
Proposed branch:	lp:~mir-team/mir/server-platform-probing
Merge into:	lp:mir
Prerequisite:	lp:~mir-team/mir/probe-client-drivers
Diff against target:	2938 lines (+1285/-339) 82 files modified CMakeLists.txt (+4/-0) debian/control (+35/-33) debian/libmirplatform6driver-android.install (+0/-1) debian/libmirplatform6driver-mesa.install (+0/-1) debian/mir-platform-graphics-android.install (+1/-0) debian/mir-platform-graphics-mesa.install (+1/-0) debian/mir-test-tools.install (+1/-1) debian/rules (+1/-14) include/platform/mir/graphics/platform.h (+31/-1) include/platform/mir/module_properties.h (+37/-0) platform-ABI-sha1sums (+2/-1) server-ABI-sha1sums (+2/-1) src/CMakeLists.txt (+1/-6) src/client/default_connection_configuration.cpp (+1/-1) src/common/graphics/android/mir_native_window.cpp (+0/-1) src/include/platform/mir/graphics/platform_probe.h (+37/-0) src/include/platform/mir/options/configuration.h (+2/-0) src/include/platform/mir/options/default_configuration.h (+5/-0) src/include/platform/mir/shared_library_loader.h (+0/-28) src/include/server/mir/default_server_configuration.h (+3/-0) src/platform/CMakeLists.txt (+6/-6) src/platform/graphics/CMakeLists.txt (+1/-0) src/platform/graphics/platform_probe.cpp (+59/-0) src/platform/options/default_configuration.cpp (+49/-20) src/platform/symbols.map (+3/-3) src/platforms/CMakeLists.txt (+16/-0) src/platforms/android/server/CMakeLists.txt (+16/-25) src/platforms/android/server/platform.cpp (+23/-1) src/platforms/android/server/symbols.map (+10/-0) src/platforms/common/server/symbols.map (+4/-3) src/platforms/mesa/server/CMakeLists.txt (+19/-26) src/platforms/mesa/server/platform.cpp (+32/-1) src/platforms/mesa/server/symbols.map (+16/-0) src/server/CMakeLists.txt (+5/-1) src/server/graphics/CMakeLists.txt (+1/-1) src/server/graphics/default_configuration.cpp (+45/-13) src/server/report/default_server_configuration.cpp (+9/-0) src/server/report/logging/logging_report_factory.cpp (+5/-0) src/server/report/logging_report_factory.h (+1/-0) src/server/report/lttng/CMakeLists.txt (+1/-0) src/server/report/lttng/lttng_report_factory.cpp (+6/-0) src/server/report/lttng/shared_library_prober_report.cpp (+52/-0) src/server/report/lttng/shared_library_prober_report.h (+48/-0) src/server/report/lttng/shared_library_prober_report_tp.h (+70/-0) src/server/report/lttng/tracepoints.c (+1/-0) src/server/report/lttng_report_factory.h (+1/-0) src/server/report/null/null_report_factory.cpp (+11/-0) src/server/report/null_report_factory.h (+2/-0) src/server/report/report_factory.h (+2/-0) src/server/server.cpp (+8/-5) src/server/symbols.map (+2/-0) src/wrapper.c (+3/-0) tests/acceptance-tests/CMakeLists.txt (+1/-5) tests/acceptance-tests/server_configuration_wrapping.cpp (+3/-0) tests/acceptance-tests/test_symbols_required_by_mesa.cpp (+2/-2) tests/include/mir_test_framework/client_platform_factory.h (+2/-2) tests/include/mir_test_framework/executable_path.h (+2/-0) tests/include/mir_test_framework/headless_test.h (+1/-1) tests/include/mir_test_framework/stub_server_platform_factory.h (+49/-0) tests/integration-tests/CMakeLists.txt (+10/-1) tests/mir_test_doubles/CMakeLists.txt (+10/-8) tests/mir_test_framework/CMakeLists.txt (+36/-18) tests/mir_test_framework/executable_path.cpp (+27/-0) tests/mir_test_framework/headless_test.cpp (+5/-27) tests/mir_test_framework/platform_graphics_dummy.cpp (+36/-0) tests/mir_test_framework/stub_client_platform_factory.cpp (+1/-0) tests/mir_test_framework/stub_server_platform_factory.cpp (+72/-0) tests/mir_test_framework/stubbed_graphics_platform.cpp (+11/-7) tests/mir_test_framework/stubbed_server_configuration.cpp (+2/-2) tests/mir_test_framework/symbols-server.map (+8/-0) tests/mir_test_framework/testing_client_options.cpp (+2/-53) tests/unit-tests/CMakeLists.txt (+27/-8) tests/unit-tests/client/CMakeLists.txt (+1/-0) tests/unit-tests/client/test_client_platform.cpp (+4/-4) tests/unit-tests/client/test_probing_client_platform_factory.cpp (+3/-3) tests/unit-tests/graphics/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/android/test_platform.cpp (+26/-0) tests/unit-tests/graphics/mesa/test_platform.cpp (+24/-0) tests/unit-tests/graphics/test_platform_prober.cpp (+215/-0) tests/unit-tests/shared_library_test.cpp (+1/-1) tools/install_on_android.sh (+3/-3) tools/valgrind_suppressions_armhf (+9/-0)
To merge this branch:	bzr merge lp:~mir-team/mir/server-platform-probing
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-12-17	Needs Fixing on 2015-01-22
Cemil Azizoglu (community)			Approve on 2015-01-22
Alberto Aguirre (community)			Approve on 2015-01-22
Alan Griffiths			Approve on 2015-01-15
Chris Halse Rogers			Approve on 2015-01-14
Daniel van Vugt			Needs Fixing on 2015-01-12
Robert Carr (community)		2014-12-17	Approve on 2015-01-05
Andreas Pokorny (community)			Approve on 2014-12-20
Review via email: mp+244982@code.launchpad.net

This proposal supersedes a proposal from 2014-12-01.

Commit message

Add server-side platform probing support.

Modules are checked in MIR_SERVER_PLATFORM_PATH, with configuration overrides available to both force a specific module and to check in a specific path.

Modules are probed to determine whether they can drive the available hardware. If a real platform - Android or Mesa - is capable of driving the hardware then it is used; otherwise the stub platform is loaded.

Description of the change

The second part of driver loading.

This removes our update-alternatives cludge, and should make bugs like lp #1396978 a thing of the past.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2122
http://jenkins.qa.ubuntu.com/job/mir-ci/2295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/391/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/391/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/365/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2123
http://jenkins.qa.ubuntu.com/job/mir-ci/2303/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/374/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-02: Posted in a previous version of this proposal

first run over the mp:

+ 996 too much indent

What is the idea behind ModuleProperties? Just human readable information about the module, or something to base the module selection on?

Revision history for this message

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

FAILED: Continuous integration, rev:2124
http://jenkins.qa.ubuntu.com/job/mir-ci/2317/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/392/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/308/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/392/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2014-12-03: Posted in a previous version of this proposal

ModuleProperties is meant to be human-readable information.

Ah. I see I've failed to log that anywhere. I'll update so that the driver selected gets logged.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-04: Posted in a previous version of this proposal

Since you already used 'graphics' in the ABI and since we are slowly moving towards an input platform library:
suggestion: l308: platform_library -> platfom_graphics_library

l772: catch by reference

l:1671 : why those changes? I thought this only changes the server side part?

l:1746: It seems that the contents of input_recordings/ are not in use anymore, you could also just drop it.

less of a needs fixing: Thinking about input platform: mir::ModuleProperties instead of mir::graphics::ModuleProperties or do you expect graphics related information there?

review: Needs Fixing

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-08: Posted in a previous version of this proposal

after merging, mirplatformgraphicsstub needs mir-test-doubles now.

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-09: Posted in a previous version of this proposal

Why do you deal with environment in 918 and the following by just using options.parse_environment(.."MIR_SERVER_"). Additionally the priority between environment value and command line option is in the current MP:

1 command line option for library
2 environment for library
3 environment for search path
4 command line option for search path

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-09: Posted in a previous version of this proposal

s/by/instead of/ on last comment

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-09: Posted in a previous version of this proposal

> Why do you deal with environment in 918 and the following by just using
> options.parse_environment(.."MIR_SERVER_"). Additionally the priority between
> environment value and command line option is in the current MP:

nm, forgot about mir::options behavior towards unknown environment variables..

additional nits:
677, 749 for (

With this MP we could rename the graphics_platform_path to just platform_path, and the define MIR_SERVER_PLATFORM_VERSION to MIR_SERVER_GRAPHICS_PLATFORM_VERSION.

So with that I am done reviewing.

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-10: Posted in a previous version of this proposal

looks good

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2140
http://jenkins.qa.ubuntu.com/job/mir-ci/2344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/425/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2141
http://jenkins.qa.ubuntu.com/job/mir-ci/2353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/462/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/462
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/350/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/436/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-12-12: Posted in a previous version of this proposal

lgtm

p.s. if you are going to continue using this indentation style consider proposing an update to the style guide "Use only spaces, and indent 4 spaces at a time.".

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-12: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-15: Posted in a previous version of this proposal

Needs another merge with lp:mir .. there are further conflicts in headless_test and more..

review: Needs Fixing

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-17:

did the merging, and while doing that also added "_graphics_" to the C-entry points of the graphics platform ABI.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2014-12-18:

Hm. I think that SharedLibraryProbeReport is a mistake.

I had it in the client platform because we currently have no way to log from the client, but on the server it really just wants to be logged.

I now think the correct solution is to add logging support to the client library and then log everywhere. For a temporary fix, I think it'd be OK to default to log_opt_value rather than none_opt_value.

Otherwise (unsurprisingly!) +1.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

FAILED: Continuous integration, rev:2153
http://jenkins.qa.ubuntu.com/job/mir-ci/2522/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/657/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/657/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/631/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/519/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/631/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

FAILED: Continuous integration, rev:2154
http://jenkins.qa.ubuntu.com/job/mir-ci/2523/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/633/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/633/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-19:

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

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-12-20:

not blocking but something to look into afterwards: + 730 to + 765, the whole handling of platform library specific configuration options.

The rest works fairly well and looks good to me.

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-12-31:

(1) Clients now output log messages (against the will of the client/toolkit author):
[1420010155.311855] (II) Loader: Loading modules from: bin/../lib/client-modules/
[1420010155.312103] (II) Loader: Loading module: bin/../lib/client-modules/dummy.so
[1420010155.312518] (II) Loader: Loading module: bin/../lib/client-modules/mesa.so
[1420010155.312695] (II) Loader: Loading module: bin/../lib/client-modules/android.so
We need to avoid upsetting client/toolkit developers, but also especially users of clients. A library like libmirclient should not write to stdout/stderr except on error.

(2) mirout (et al?) need wrapping applied. See also (1)
$ sudo bin/mirout
[1420010358.848748] (II) Loader: Loading modules from: /usr/local/lib/mir/client-platform/
[1420010358.848888] (EE) Loader: Failed to load libraries from path: /usr/local/lib/mir/client-platform/ (error was:No such file or directory)
Could not connect to a display server.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-12-31:

(3) This smells like a bug (?) ...
[1420010081.113978] (WW) Loader: Failed to load module: bin/../lib/server-modules/graphics-dummy.so (error was:bin/../lib/server-modules/graphics-dummy.so: undefined symbol: _ZN3mir4test4PipeD1Ev)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-12-31:

(2) Wrapping fixed here: https://code.launchpad.net/~vanvugt/mir/wrap-the-rest/+merge/245464

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-31:

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

review: Approve (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-01-05:

LGTM! Left some trivial inline thoughts.

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-07:

(1) Fix proposed: https://code.launchpad.net/~vanvugt/mir/log-level/+merge/245718

(2) Fix landed (r2191)

(3) Still needs fixing, maybe?

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-07:

BTW I haven't done any code review yet. Just manual testing and fixing the obvious issues right now...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-07:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-12:

Results from manual testing:

(1) Clients now output noisy log messages (against the will of the client/toolkit author):
[1420010155.311855] (II) Loader: Loading modules from: bin/../lib/client-modules/
[1420010155.312103] (II) Loader: Loading module: bin/../lib/client-modules/dummy.so
[1420010155.312518] (II) Loader: Loading module: bin/../lib/client-modules/mesa.so
[1420010155.312695] (II) Loader: Loading module: bin/../lib/client-modules/android.so
Fix proposed: https://code.launchpad.net/~vanvugt/mir/log-level/+merge/246092

(3) This warning appears to be new from this branch. Sounds like a bug:
[1420010081.113978] (WW) Loader: Failed to load module: bin/../lib/server-modules/graphics-dummy.so (error was:bin/../lib/server-modules/graphics-dummy.so: undefined symbol: _ZN3mir4test4PipeD1Ev)

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-12:

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

review: Approve (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2015-01-14:

LGTM now. I slightly prefer the client output to no client output.

review: Approve

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-01-14:

> Results from manual testing:
>
> (1) Clients now output noisy log messages (against the will of the
> client/toolkit author):
> [...]
> Fix proposed: https://code.launchpad.net/~vanvugt/mir/log-level/+merge/246092

So it will be addressed there?

> (3) This warning appears to be new from this branch. Sounds like a bug:
> [1420010081.113978] (WW) Loader: Failed to load module: bin/../lib/server-
> modules/graphics-dummy.so (error was:bin/../lib/server-modules/graphics-
> dummy.so: undefined symbol: _ZN3mir4test4PipeD1Ev)

should be gone now.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-14:

FAILED: Continuous integration, rev:2159
http://jenkins.qa.ubuntu.com/job/mir-ci/2645/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/848/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/848/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/642/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/810/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-14:

FAILED: Continuous integration, rev:2160
http://jenkins.qa.ubuntu.com/job/mir-ci/2648/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/852
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/852/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/814/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/814/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-14:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-15:

(1) I'd rather have this future bug fixed before it ever affects lp:mir. It becomes a regression if we land this without having fixed the client logging first.

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-01-15:

review: Approve

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-19:

anpok: Careful with those spurious merges. Or at least spurious merge comments...?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-20:

FAILED: Continuous integration, rev:2164
http://jenkins.qa.ubuntu.com/job/mir-ci/2710/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/931/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/931/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/893/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/893/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-21:

FAILED: Continuous integration, rev:2165
http://jenkins.qa.ubuntu.com/job/mir-ci/2737/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/962/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/962/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/924/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/924/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-21:

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

review: Approve (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-01-22:

623 + catch (std::runtime_error const& err)

Why not std::exception?

===
2903 +++ tools/install_on_android.sh 2015-01-21 10:31:54 +0000
2904 @@ -32,11 +32,11 @@
2905 lib/libmirclient.so.* \
2906 lib/libmircommon.so.* \
2907 lib/libmirplatform.so.* \
2908 - lib/libmirplatform*driver.so \
2909 - lib/libmirclient*driver.so \
2910 + lib/platform-graphics-dummy.so \
2911 + lib/client-modules/* \
2912 + lib/server-modules/* \
2913 lib/libmirprotobuf.so.* \
2914 lib/libmirclient-debug-extension.so.* \
2915 - lib/libmirplatformstub.so \
2916 lib/libmirserver.so.*
===

Needs more modifications to work, given the current wrapper (i.e. copying the .mir_xxx executables and creating a bin and lib directory on the android side. But it looks like that's a pre-existing issue and is being addressed in https://code.launchpad.net/~andreas-pokorny/mir/unwrap-the-wrap/+merge/247117

Looks good otherwise.

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-22:

Wrapped binaries work perfectly on the Android side if copied using rsync. Not sure if adb push does though.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-22:

FAILED: Continuous integration, rev:2167
http://jenkins.qa.ubuntu.com/job/mir-ci/2778/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1015
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/977/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/775
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/775/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/977/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-01-22:

I think the log messages are rather informative. We should go ahead and TA this branch.

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-01-22:

Gave this branch a final test. It looks good. I'd rather land this and not wait for a minor issue to hold such a large MP up. Hopefully we can address the logging issue before we land on the distro.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-22:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1052/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1020
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/982/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/232
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/232/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/982/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-23:

Please don't create regressions intentionally. I didn't want to own this one, but somehow I do now.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-01-23:

Hmm, there's a simple way to avoid blocking on the log-level branch actually. Just remove any log calls from mircommon/mirclient that might appear as a result of this branch.

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-01-23:

I don't regard it as a regression. What module gets loaded is vital information - exactly what logging was designed to do. Besides we are not flooding the terminal (as that was one of the criteria for logging).

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2015-01-22 05:20:46 +0000
 +++ CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -30,6 +30,10 @@
  set(MIR_VERSION_MINOR 11) # This should change at least with every MIRSERVER_ABI
  set(MIR_VERSION_PATCH 0)
++add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
++add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
++add_definitions(-DMIR_VERSION_MICRO=${MIR_VERSION_PATCH})
++
  set(MIR_VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH})
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 === modified file 'debian/control'
 --- debian/control	2015-01-20 10:07:15 +0000
 +++ debian/control	2015-01-22 15:40:28 +0000
@@ -59,6 +59,8 @@
   Contains the shared library containing the Google Protobuf definitions
   required for Mir clients and servers.
++#TODO: Packaging infrastructure for better dependency generation,
++#      ala pkg-xorg's xviddriver:Provides and ABI detection.
  Package: libmirserver29
  Section: libs
  Architecture: i386 amd64 armhf arm64
@@ -66,7 +68,7 @@
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
           ${shlibs:Depends},
--         libmir${platform-driver}-mesa | libmir${platform-driver}-android,
++         mir-platform-graphics-mesa | mir-platform-graphics-android,
  Description: Display server for Ubuntu - server library
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
@@ -266,6 +268,34 @@
   Contains the shared libraries required for the Mir server and client.
  # Longer-term these drivers should move out-of-tree
++Package: mir-platform-graphics-mesa
++Section: libs
++Architecture: i386 amd64 armhf arm64
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Description: Display server for Ubuntu - platform library for Mesa
++ Mir is a display server running on linux systems, with a focus on efficiency,
++ robust operation and a well-defined driver model.
++ .
++ Contains the shared libraries required for the Mir server to interact with
++ the hardware platform using the Mesa drivers.
++
++Package: mir-platform-graphics-android
++Section: libs
++Architecture: i386 amd64 armhf
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++Description: Display server for Ubuntu - platform library for Android
++ Mir is a display server running on linux systems, with a focus on efficiency,
++ robust operation and a well-defined driver model.
++ .
++ Contains the shared libraries required for the Mir server to interact with
++ the hardware platform using the Android drivers.
++
  Package: mir-client-platform-mesa
  Section: libs
  Architecture: i386 amd64 armhf arm64
@@ -294,42 +324,14 @@
   Contains the shared libraries required for the Mir clients to interact with
   the underlying hardware platform using the Android drivers.
--Package: libmirplatform6driver-mesa
--Section: libs
--Architecture: i386 amd64 armhf arm64
--Multi-Arch: same
--Pre-Depends: ${misc:Pre-Depends}
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Description: Display server for Ubuntu - platform library for Mesa
-- Mir is a display server running on linux systems, with a focus on efficiency,
-- robust operation and a well-defined driver model.
-- .
-- Contains the shared libraries required for the Mir server to interact with
-- the hardware platform using the Mesa drivers.
--
--Package: libmirplatform6driver-android
--Section: libs
--Architecture: i386 amd64 armhf
--Multi-Arch: same
--Pre-Depends: ${misc:Pre-Depends}
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Description: Display server for Ubuntu - platform library for Android
-- Mir is a display server running on linux systems, with a focus on efficiency,
-- robust operation and a well-defined driver model.
-- .
-- Contains the shared libraries required for the Mir server to interact with
-- the hardware platform using the Android drivers.
--
  Package: mir-graphics-drivers-desktop
  Section: libs
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
--         libmir${platform-driver}-mesa,
--         mir-client-platform-mesa
++         mir-platform-graphics-mesa,
++         mir-client-platform-mesa,
  Description: Display server for Ubuntu - desktop driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
@@ -343,8 +345,8 @@
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
--         libmir${platform-driver}-android,
--         mir-client-platform-android
++         mir-platform-graphics-android,
++         mir-client-platform-android,
  Description: Display server for Ubuntu - android driver metapackage
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
 === removed file 'debian/libmirplatform6driver-android.install'
 --- debian/libmirplatform6driver-android.install	2015-01-14 06:39:13 +0000
 +++ debian/libmirplatform6driver-android.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--usr/lib/*/mir/platform*driver/android/*
 === removed file 'debian/libmirplatform6driver-mesa.install'
 --- debian/libmirplatform6driver-mesa.install	2015-01-14 06:39:13 +0000
 +++ debian/libmirplatform6driver-mesa.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--usr/lib/*/mir/platform*driver/mesa/*
 === added file 'debian/mir-platform-graphics-android.install'
 --- debian/mir-platform-graphics-android.install	1970-01-01 00:00:00 +0000
 +++ debian/mir-platform-graphics-android.install	2015-01-22 15:40:28 +0000
@@ -0,0 +1,1 @@
++usr/lib/*/mir/server-platform/graphics-android.so
 === added file 'debian/mir-platform-graphics-mesa.install'
 --- debian/mir-platform-graphics-mesa.install	1970-01-01 00:00:00 +0000
 +++ debian/mir-platform-graphics-mesa.install	2015-01-22 15:40:28 +0000
@@ -0,0 +1,1 @@
++usr/lib/*/mir/server-platform/graphics-mesa.so
 === modified file 'debian/mir-test-tools.install'
 --- debian/mir-test-tools.install	2015-01-14 06:39:13 +0000
 +++ debian/mir-test-tools.install	2015-01-22 15:40:28 +0000
@@ -5,5 +5,5 @@
  usr/bin/mir_performance_tests
  usr/lib/*/mir/tools/libmirclientlttng.so
  usr/lib/*/mir/tools/libmirserverlttng.so
--usr/lib/*/libmirplatformstub.so
++usr/lib/*/mir/server-platform/graphics-dummy.so
  usr/lib/*/mir/client-platform/dummy.so
 === modified file 'debian/rules'
 --- debian/rules	2015-01-16 02:57:31 +0000
 +++ debian/rules	2015-01-22 15:40:28 +0000
@@ -13,8 +13,6 @@
  export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
  export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
--export PLATFORM_DRIVER = platform6driver
--
  %:
  	dh $@ --parallel --fail-missing
@@ -57,15 +55,4 @@
  # Delete the symlink so that --fail-missing doesn't think we've missed it
  # accidentally.
  	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
--	dh_install --fail-missing \
--	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so
--	sh debian/install_ld_so_conf.sh $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
--
--override_dh_installdeb:
--	sh debian/create_postinst_prerm_scripts.sh \
--	  $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
--	dh_installdeb
--
--override_dh_gencontrol:
--	dh_gencontrol -- \
--		-Vplatform-driver=$(PLATFORM_DRIVER)
++	dh_install --fail-missing
 === modified file 'include/platform/mir/graphics/platform.h'
 --- include/platform/mir/graphics/platform.h	2015-01-14 06:39:13 +0000
 +++ include/platform/mir/graphics/platform.h	2015-01-22 15:40:28 +0000
@@ -24,6 +24,8 @@
  #include <EGL/egl.h>
  #include <memory>
++#include "mir/module_properties.h"
++
  namespace mir
+ {
  class EmergencyCleanupRegistry;
@@ -93,6 +95,25 @@
  };
  /**
++ * A measure of how well a platform supports a device
++ *
++ * \note This is compared as an integer; best + 1 is a valid PlatformPriority that
++ *       will be used in preference to a module that reports best.
++ *       Platform modules distributed with Mir will never use a priority higher
++ *       than best.
++ */
++enum PlatformPriority : uint32_t
++{
++    unsupported = 0,    /**< Unable to function at all on this device */
++    supported = 128,    /**< Capable of providing a functioning Platform on this device,
++                         *   possibly with degraded performance or features.
++                         */
++    best = 256          /**< Capable of providing a Platform with the best features and
++                         *   performance this device is capable of.
++                         */
++};
++
++/**
   * Function prototype used to return a new host graphics platform. The host graphics platform
   * is the system entity that owns the physical display and is a mir host server.
+  *
@@ -142,8 +163,17 @@
   */
  extern "C" typedef void(*AddPlatformOptions)(
      boost::program_options::options_description& config);
--extern "C" void add_platform_options(
++extern "C" void add_graphics_platform_options(
      boost::program_options::options_description& config);
++
++// TODO: We actually need to be more granular here; on a device with more
++//       than one graphics system we may need a different platform per GPU,
++//       so we should be associating platforms with graphics devices in some way
++extern "C" typedef PlatformPriority(*PlatformProbe)();
++extern "C" PlatformPriority probe_graphcis_platform();
++
++extern "C" typedef ModuleProperties const*(*DescribeModule)();
++extern "C" ModuleProperties const* describe_graphics_module();
+ }
+ }
 === added file 'include/platform/mir/module_properties.h'
 --- include/platform/mir/module_properties.h	1970-01-01 00:00:00 +0000
 +++ include/platform/mir/module_properties.h	2015-01-22 15:40:28 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#ifndef MIR_PLATFORM_MODULE_PROPERTIES_H_
++#define MIR_PLATFORM_MODULE_PROPERTIES_H_
++
++namespace mir
++{
++
++/**
++ * Describes a platform module
++ */
++struct ModuleProperties
++{
++    char const* name;
++    int major_version;
++    int minor_version;
++    int micro_version;
++};
++}
++
++#endif /* MIR_PLATFORM_MODULE_PROPERTIES_H_ */
 === modified file 'platform-ABI-sha1sums'
 --- platform-ABI-sha1sums	2015-01-20 03:21:20 +0000
 +++ platform-ABI-sha1sums	2015-01-22 15:40:28 +0000
@@ -49,9 +49,10 @@
 dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
  d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
--5d72b98aecb0611060dec8995dbe017a342f7069  include/platform/mir/graphics/platform.h
++d3da5e58e8e1d5953b459d18f9dfe628fe0a25bd  include/platform/mir/graphics/platform.h
  d1ba61e687d75103e9e7aa0409080214f56a990b  include/platform/mir/graphics/platform_ipc_operations.h
 b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
  f0db0484b8ccc9091e73c80a2a200cb436b48bfb  include/platform/mir/graphics/platform_operation_message.h
  f18876766861e5d4f5ca999dbd176fe1fc520594  include/platform/mir/graphics/renderable.h
++5b3872b04b3686fe9a244572ca0787596431a2cb  include/platform/mir/module_properties.h
  b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 === modified file 'server-ABI-sha1sums'
 --- server-ABI-sha1sums	2015-01-22 14:33:14 +0000
 +++ server-ABI-sha1sums	2015-01-22 15:40:28 +0000
@@ -49,11 +49,12 @@
 dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
  d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
--5d72b98aecb0611060dec8995dbe017a342f7069  include/platform/mir/graphics/platform.h
++d3da5e58e8e1d5953b459d18f9dfe628fe0a25bd  include/platform/mir/graphics/platform.h
  d1ba61e687d75103e9e7aa0409080214f56a990b  include/platform/mir/graphics/platform_ipc_operations.h
 b77fb3290af00dc7d1c11dcc5388972dacb9ec3  include/platform/mir/graphics/platform_ipc_package.h
  f0db0484b8ccc9091e73c80a2a200cb436b48bfb  include/platform/mir/graphics/platform_operation_message.h
  f18876766861e5d4f5ca999dbd176fe1fc520594  include/platform/mir/graphics/renderable.h
++5b3872b04b3686fe9a244572ca0787596431a2cb  include/platform/mir/module_properties.h
  b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
  f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
  a9f284ba4b05d58fd3eeb628d1f56fe4ac188526  include/server/mir/compositor/compositor_id.h
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2015-01-22 03:10:13 +0000
 +++ src/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -2,12 +2,6 @@
  # and the platform implementations.
  set(MIRPLATFORM_ABI 6)
--set(PLATFORM_DRIVER platform${MIRPLATFORM_ABI}driver)
--set(MIR_PLATFORM_DRIVER mir${PLATFORM_DRIVER})
--set(MIR_PLATFORM_DRIVER_BINARY lib${MIR_PLATFORM_DRIVER}.so
--    CACHE STRING "File name of Mir server platform drivers")
--add_definitions(-DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}")
--
  # We need MIR_CLIENT_PLATFORM_PATH in both libmirclient and the platform
  # implementations
  set(MIR_CLIENT_PLATFORM_PATH
@@ -47,3 +41,4 @@
  set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
  set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
  set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
++set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
 === modified file 'src/client/default_connection_configuration.cpp'
 --- src/client/default_connection_configuration.cpp	2015-01-19 04:52:47 +0000
 +++ src/client/default_connection_configuration.cpp	2015-01-22 15:40:28 +0000
@@ -226,7 +226,7 @@
          [this] () -> std::shared_ptr<mir::SharedLibraryProberReport>
+         {
              auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT");
--            std::string const val{val_raw ? val_raw : off_opt_val};
++            std::string const val{val_raw ? val_raw : log_opt_val};
              if (val == log_opt_val)
                  return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger());
              else if (val == lttng_opt_val)
 === modified file 'src/common/graphics/android/mir_native_window.cpp'
 --- src/common/graphics/android/mir_native_window.cpp	2015-01-14 06:39:13 +0000
 +++ src/common/graphics/android/mir_native_window.cpp	2015-01-22 15:40:28 +0000
@@ -20,7 +20,6 @@
  #include "mir/graphics/android/android_driver_interpreter.h"
  #include "mir/graphics/android/sync_fence.h"
--#include <iostream>
  #include <boost/exception/diagnostic_information.hpp>
  namespace mg=mir::graphics;
 === added file 'src/include/platform/mir/graphics/platform_probe.h'
 --- src/include/platform/mir/graphics/platform_probe.h	1970-01-01 00:00:00 +0000
 +++ src/include/platform/mir/graphics/platform_probe.h	2015-01-22 15:40:28 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#ifndef MIR_GRAPHICS_PLATFORM_PROBE_H_
++#define MIR_GRAPHICS_PLATFORM_PROBE_H_
++
++#include <vector>
++#include <memory>
++#include "mir/shared_library.h"
++
++namespace mir
++{
++namespace graphics
++{
++class Platform;
++
++std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
++
++}
++}
++
++#endif // MIR_GRAPHICS_PLATFORM_PROBE_H_
 === modified file 'src/include/platform/mir/options/configuration.h'
 --- src/include/platform/mir/options/configuration.h	2015-01-14 06:39:13 +0000
 +++ src/include/platform/mir/options/configuration.h	2015-01-22 15:40:28 +0000
@@ -33,6 +33,7 @@
  extern char const* const enable_input_opt;
  extern char const* const session_mediator_report_opt;
  extern char const* const msg_processor_report_opt;
++extern char const* const shared_library_prober_report_opt;
  extern char const* const compositor_report_opt;
  extern char const* const display_report_opt;
  extern char const* const legacy_input_report_opt;
@@ -53,6 +54,7 @@
  extern char const* const lttng_opt_value;
  extern char const* const platform_graphics_lib;
++extern char const* const platform_path;
  class Configuration
+ {
 === modified file 'src/include/platform/mir/options/default_configuration.h'
 --- src/include/platform/mir/options/default_configuration.h	2015-01-14 06:39:13 +0000
 +++ src/include/platform/mir/options/default_configuration.h	2015-01-22 15:40:28 +0000
@@ -25,6 +25,7 @@
  namespace mir
+ {
++class SharedLibrary;
  namespace options
+ {
  class DefaultConfiguration : public Configuration
@@ -42,6 +43,10 @@
      boost::program_options::options_description_easy_init add_options();
  private:
++    // MUST be the first member to ensure it's destroyed last, lest we attempt to
++    // call destructors in DSOs we've unloaded.
++    std::shared_ptr<SharedLibrary> platform_graphics_library;
++
      void add_platform_options();
      // accessed via the base interface, when access to add_options() has been "lost"
      std::shared_ptr<options::Option> the_options() const override;
 === removed file 'src/include/platform/mir/shared_library_loader.h'
 --- src/include/platform/mir/shared_library_loader.h	2015-01-14 06:39:13 +0000
 +++ src/include/platform/mir/shared_library_loader.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
--/*
-- * Copyright © 2013 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU Lesser General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
-- */
--
--#ifndef MIR_SHARED_LIBRARY_LOADER_H_
--#define MIR_SHARED_LIBRARY_LOADER_H_
--
--#include <string>
--namespace mir
--{
--class SharedLibrary;
--SharedLibrary const* load_library(std::string const& libname);
--}
--#endif
 === modified file 'src/include/server/mir/default_server_configuration.h'
 --- src/include/server/mir/default_server_configuration.h	2015-01-14 06:39:13 +0000
 +++ src/include/server/mir/default_server_configuration.h	2015-01-22 15:40:28 +0000
@@ -40,6 +40,7 @@
  namespace mir
+ {
  class ServerActionQueue;
++class SharedLibraryProberReport;
  namespace compositor
+ {
@@ -315,6 +316,7 @@
      virtual std::shared_ptr<time::Clock> the_clock();
      virtual std::shared_ptr<ServerActionQueue> the_server_action_queue();
++    virtual std::shared_ptr<SharedLibraryProberReport>  the_shared_library_prober_report();
  protected:
      std::shared_ptr<options::Option> the_options() const;
@@ -424,6 +426,7 @@
      CachedPtr<scene::CoordinateTranslator> coordinate_translator;
      CachedPtr<EmergencyCleanup> emergency_cleanup;
      CachedPtr<shell::HostLifecycleEventListener> host_lifecycle_event_listener;
++    CachedPtr<SharedLibraryProberReport> shared_library_prober_report;
  private:
      std::shared_ptr<options::Configuration> const configuration_options;
 === modified file 'src/platform/CMakeLists.txt'
 --- src/platform/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ src/platform/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -7,12 +7,10 @@
  set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
--add_library(mirplatformobjects OBJECT
--  shared_library_loader.cpp
--)
++add_definitions(-DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}")
++add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
  set(MIR_PLATFORM_OBJECTS
--  $<TARGET_OBJECTS:mirplatformobjects>
    $<TARGET_OBJECTS:mirplatformgraphicscommon>
    $<TARGET_OBJECTS:miroptions>
    $<TARGET_OBJECTS:mirfatal>
@@ -31,17 +29,19 @@
+ )
  target_link_libraries(mirplatform
++
    mircommon
    ${MIR_PLATFORM_REFERENCES}
+ )
--set_target_properties(mirplatform
++set_target_properties(
++  mirplatform
++
    PROPERTIES
    SOVERSION ${MIRPLATFORM_ABI}
    LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+ )
--
  install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  add_subdirectory(graphics/)
 === modified file 'src/platform/graphics/CMakeLists.txt'
 --- src/platform/graphics/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ src/platform/graphics/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -12,6 +12,7 @@
    gl_program.cpp
    gl_texture.cpp
    tessellation_helpers.cpp
++  platform_probe.cpp
+ )
  add_library(mirplatformgraphicscommon OBJECT
 === added file 'src/platform/graphics/platform_probe.cpp'
 --- src/platform/graphics/platform_probe.cpp	1970-01-01 00:00:00 +0000
 +++ src/platform/graphics/platform_probe.cpp	2015-01-22 15:40:28 +0000
@@ -0,0 +1,59 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#include "mir/logging/logger.h"
++#include "mir/graphics/platform.h"
++#include "mir/graphics/platform_probe.h"
++
++#include <string>
++#include <boost/throw_exception.hpp>
++
++namespace ml = mir::logging;
++
++std::shared_ptr<mir::SharedLibrary>
++mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules)
++{
++    mir::graphics::PlatformPriority best_priority_so_far = mir::graphics::unsupported;
++    std::shared_ptr<mir::SharedLibrary> best_module_so_far;
++    for (auto& module : modules)
++    {
++        try
++        {
++            auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_graphics_platform",
++                                                                             MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
++            auto module_priority = probe();
++            if (module_priority > best_priority_so_far)
++            {
++                best_priority_so_far = module_priority;
++                best_module_so_far = module;
++            }
++        }
++        catch (std::runtime_error const& err)
++        {
++            // Tried to probe a SharedLibrary that isn't a platform module?
++            ml::log(ml::Severity::warning,
++                    std::string{"Failed to probe module. Not a platform library? Error: "} + err.what(),
++                    "Platform Probing");
++        }
++    }
++    if (best_priority_so_far > mir::graphics::unsupported)
++    {
++        return best_module_so_far;
++    }
++    BOOST_THROW_EXCEPTION((std::runtime_error{"Failed to find platform for current system"}));
++}
 === modified file 'src/platform/options/default_configuration.cpp'
 --- src/platform/options/default_configuration.cpp	2015-01-14 06:39:13 +0000
 +++ src/platform/options/default_configuration.cpp	2015-01-22 15:40:28 +0000
@@ -17,11 +17,13 @@
   */
  #include "mir/shared_library.h"
--#include "mir/shared_library_loader.h"
  #include "mir/options/default_configuration.h"
  #include "mir/graphics/platform.h"
  #include "mir/default_configuration.h"
  #include "mir/abnormal_exit.h"
++#include "mir/shared_library_prober.h"
++#include "mir/logging/null_shared_library_prober_report.h"
++#include "mir/graphics/platform_probe.h"
  #include <dlfcn.h>
@@ -39,6 +41,7 @@
  char const* const mo::connector_report_opt        = "connector-report";
  char const* const mo::scene_report_opt            = "scene-report";
  char const* const mo::input_report_opt            = "input-report";
++char const* const mo::shared_library_prober_report_opt = "shared-library-prober-report";
  char const* const mo::host_socket_opt             = "host-socket";
  char const* const mo::frontend_threads_opt        = "ipc-thread-pool";
  char const* const mo::name_opt                    = "name";
@@ -52,12 +55,12 @@
  char const* const mo::lttng_opt_value = "lttng";
  char const* const mo::platform_graphics_lib = "platform-graphics-lib";
++char const* const mo::platform_path = "platform-path";
  namespace
+ {
  int const default_ipc_threads          = 1;
  bool const enable_input_default        = true;
--char const* const default_platform_graphics_lib = MIR_PLATFORM_DRIVER_BINARY;
  // Hack around the way Qt loads mir:
  // platform_api and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -114,8 +117,10 @@
              "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
          (no_server_socket_opt, "Do not provide a socket filename for client connections")
          (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections")
--        (platform_graphics_lib, po::value<std::string>()->default_value(default_platform_graphics_lib),
--            "Library to use for platform graphics support")
++        (platform_graphics_lib, po::value<std::string>(),
++            "Library to use for platform graphics support (default: autodetect)")
++        (platform_path, po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PATH),
++            "Directory to look for platform libraries (default: " MIR_SERVER_PLATFORM_PATH ")")
          (enable_input_opt, po::value<bool>()->default_value(enable_input_default),
              "Enable input.")
          (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value),
@@ -134,6 +139,8 @@
              "How to handle the MessageProcessor report. [{log,lttng,off}]")
          (scene_report_opt, po::value<std::string>()->default_value(off_opt_value),
              "How to handle the scene report. [{log,lttng,off}]")
++        (shared_library_prober_report_opt, po::value<std::string>()->default_value(log_opt_value),
++            "How to handle the SharedLibraryProber report. [{log,lttng,off}]")
          (frontend_threads_opt, po::value<int>()->default_value(default_ipc_threads),
              "threads in frontend thread pool.")
          (name_opt, po::value<std::string>(),
@@ -156,26 +163,48 @@
      po::options_description program_options;
      program_options.add_options()
          (platform_graphics_lib,
--         po::value<std::string>()->default_value(default_platform_graphics_lib), "");
++         po::value<std::string>(), "");
++    program_options.add_options()
++        (platform_path,
++         po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PATH),
++        "");
      mo::ProgramOption options;
      options.parse_arguments(program_options, argc, argv);
--    std::string graphics_libname;
++    ensure_loaded_with_rtld_global();
++
++    // TODO: We should just load all the platform plugins we can and present their options.
      auto env_libname = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_LIB");
--    if (!options.is_set(platform_graphics_lib) && env_libname)
--    {
--        graphics_libname = std::string{env_libname};
--    }
--    else
--    {
--        graphics_libname = options.get<std::string>(platform_graphics_lib);
--    }
--
--    ensure_loaded_with_rtld_global();
--
--    auto graphics_lib = load_library(graphics_libname);
--    auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
--    add_platform_options(*this->program_options);
++    auto env_libpath = ::getenv("MIR_SERVER_PLATFORM_PATH");
++    try
++    {
++        if (options.is_set(platform_graphics_lib))
++        {
++            platform_graphics_library = std::make_shared<mir::SharedLibrary>(options.get<std::string>(platform_graphics_lib));
++        }
++        else if (env_libname)
++        {
++            platform_graphics_library = std::make_shared<mir::SharedLibrary>(std::string{env_libname});
++        }
++        else
++        {
++            mir::logging::NullSharedLibraryProberReport null_report;
++            auto const plugin_path = env_libpath ? env_libpath : options.get<std::string>(platform_path);
++            auto plugins = mir::libraries_for_path(plugin_path, null_report);
++            platform_graphics_library = mir::graphics::module_for_device(plugins);
++        }
++
++        auto add_platform_options = platform_graphics_library->load_function<mir::graphics::AddPlatformOptions>("add_graphics_platform_options");
++        add_platform_options(*this->program_options);
++    }
++    catch(...)
++    {
++        // We don't actually care at this point if this failed.
++        // Maybe we've been pointed at the wrong place. Maybe this platform doesn't actually
++        // *have* platform-specific options.
++        // Regardless, if we need a platform and can't find one then we'll bail later
++        // in startup with a useful error.
++    }
+ }
  boost::program_options::options_description_easy_init mo::DefaultConfiguration::add_options()
 === modified file 'src/platform/symbols.map'
 --- src/platform/symbols.map	2015-01-20 06:24:53 +0000
 +++ src/platform/symbols.map	2015-01-22 15:40:28 +0000
@@ -6,7 +6,6 @@
      mir::fatal_error*;
      mir::fatal_error_abort*;
      mir::fatal_error_except*;
--    mir::graphics::add_platform_options*;
      mir::graphics::BufferBasic::BufferBasic*;
      mir::graphics::Buffer::Buffer*;
      mir::graphics::Buffer::can_bypass*;
@@ -17,8 +16,6 @@
      mir::graphics::Buffer::size*;
      mir::graphics::Buffer::stride*;
      mir::graphics::Buffer::write*;
--    mir::graphics::create_guest_platform*;
--    mir::graphics::create_host_platform*;
      mir::graphics::Cursor::?Cursor*;
      mir::graphics::Cursor::Cursor*;
      mir::graphics::Cursor::hide*;
@@ -81,6 +78,7 @@
      mir::graphics::GraphicBufferAllocator::GraphicBufferAllocator*;
      mir::graphics::GraphicBufferAllocator::operator*;
      mir::graphics::GraphicBufferAllocator::supported_pixel_formats*;
++    mir::graphics::module_for_device*;
      mir::graphics::operator*;
      mir::graphics::Platform::create_buffer_allocator*;
      mir::graphics::Platform::create_display*;
@@ -127,6 +125,7 @@
      mir::options::glog_log_dir*;
      mir::options::glog_minloglevel*;
      mir::options::glog_stderrthreshold*;
++    mir::options::platform_path*;
      mir::options::host_socket_opt*;
      mir::options::input_report_opt*;
      mir::options::legacy_input_report_opt*;
@@ -154,6 +153,7 @@
      mir::options::scene_report_opt*;
      mir::options::server_socket_opt*;
      mir::options::session_mediator_report_opt*;
++    mir::options::shared_library_prober_report_opt*;
      mir::options::touchspots_opt*;
      non-virtual?thunk?to?mir::graphics::Cursor::?Cursor*;
      non-virtual?thunk?to?mir::graphics::CursorImage::?CursorImage*;
 === modified file 'src/platforms/CMakeLists.txt'
 --- src/platforms/CMakeLists.txt	2015-01-22 03:10:13 +0000
 +++ src/platforms/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -1,3 +1,19 @@
++# This needs to change whenever the ABI between the platform
++# modules and the server changes in an incompatible way.
++# This ABI is much smaller than the full libmirplatform ABI.
++#
++# TODO: Add an extra driver-ABI check target.
++set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_1")
++set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)
++
++set(MIR_SERVER_PLATFORM_PATH
++  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform
++)
++set(MIR_SERVER_PLATFORM_PATH
++  ${MIR_SERVER_PLATFORM_PATH}
++  PARENT_SCOPE
++)
++
  set(server_common_include_dirs
    ${PROJECT_SOURCE_DIR}/include/platform
+ )
 === modified file 'src/platforms/android/server/CMakeLists.txt'
 --- src/platforms/android/server/CMakeLists.txt	2015-01-22 03:10:13 +0000
 +++ src/platforms/android/server/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -38,20 +38,17 @@
    ipc_operations.cpp
    hwc_blanking_control.cpp
+ )
++
  add_library(mirplatformgraphicsandroid SHARED
++
    $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
+ )
--set_target_properties(
--  mirplatformgraphicsandroid PROPERTIES
--  OUTPUT_NAME ${MIR_PLATFORM_DRIVER}
--  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
--  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${server_symbol_map}"
--)
++target_link_libraries(
++  mirplatformgraphicsandroid
--target_link_libraries(mirplatformgraphicsandroid
++  mirsharedandroid
    mirplatform
--  mirsharedandroid
    ${Boost_PROGRAM_OPTIONS_LIBRARY}
    ${LIBHARDWARE_LIBRARIES}
    ${EGL_LDFLAGS} ${EGL_LIBRARIES}
@@ -59,20 +56,14 @@
    ${ANDROID_PROPERTIES_LDFLAGS}
+ )
--install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${PLATFORM_DRIVER}/android)
--
--if (MIR_TEST_PLATFORM STREQUAL "android")
--  add_custom_command(TARGET mirplatformgraphicsandroid
--    POST_BUILD
--    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_PLATFORM_DRIVER_BINARY}
--    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> ${MIR_PLATFORM_DRIVER_BINARY}
--    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
--  )
--
--  install(CODE
--    "execute_process(
--       COMMAND ln -sf mir/${PLATFORM_DRIVER}/android/${MIR_PLATFORM_DRIVER_BINARY}
--       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
--     )"
--  )
--endif()
++set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
++
++set_target_properties(
++  mirplatformgraphicsandroid PROPERTIES
++  OUTPUT_NAME graphics-android
++  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
++  PREFIX ""
++  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
++)
++
++install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
 === modified file 'src/platforms/android/server/platform.cpp'
 --- src/platforms/android/server/platform.cpp	2015-01-22 03:10:13 +0000
 +++ src/platforms/android/server/platform.cpp	2015-01-22 15:40:28 +0000
@@ -155,7 +155,7 @@
      return std::make_shared<mga::Platform>(nullptr, display_report, mga::OverlayOptimization::disabled);
+ }
--extern "C" void add_platform_options(
++extern "C" void add_graphics_platform_options(
      boost::program_options::options_description& config)
+ {
      config.add_options()
@@ -166,3 +166,25 @@
           boost::program_options::value<bool>()->default_value(false),
           "[platform-specific] Whether to disable overlay optimizations [{on,off}]");
+ }
++
++extern "C" mg::PlatformPriority probe_graphics_platform()
++{
++    int err;
++    hw_module_t const* hw_module;
++
++    err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hw_module);
++
++    return err < 0 ? mg::PlatformPriority::unsupported : mg::PlatformPriority::best;
++}
++
++mir::ModuleProperties const description = {
++    "android",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO
++};
++
++extern "C" mir::ModuleProperties const* describe_graphics_module()
++{
++    return &description;
++}
 === added file 'src/platforms/android/server/symbols.map'
 --- src/platforms/android/server/symbols.map	1970-01-01 00:00:00 +0000
 +++ src/platforms/android/server/symbols.map	2015-01-22 15:40:28 +0000
@@ -0,0 +1,10 @@
++MIR_GRAPHICS_PLATFORM_1 {
++  global:
++    add_graphics_platform_options;
++    create_host_platform;
++    create_guest_platform;
++    probe_graphics_platform;
++    describe_graphics_module;
++  local:
++    *;
++};
 === modified file 'src/platforms/common/server/symbols.map'
 --- src/platforms/common/server/symbols.map	2015-01-22 03:10:13 +0000
 +++ src/platforms/common/server/symbols.map	2015-01-22 15:40:28 +0000
@@ -1,8 +1,9 @@
--MIR_PLATFORM_1 {
++MIR_GRAPHICS_PLATFORM_1 {
    global:
--   add_platform_options;
++   add_graphics_platform_options;
++   probe_graphics_platform;
     create_host_platform;
     create_guest_platform;
--   mir_server_mesa_egl_native_display_is_valid;
++   describe_graphics_module;
    local: *;
  };
 === modified file 'src/platforms/mesa/server/CMakeLists.txt'
 --- src/platforms/mesa/server/CMakeLists.txt	2015-01-22 03:10:13 +0000
 +++ src/platforms/mesa/server/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -15,7 +15,9 @@
  string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
  add_definitions(-D__GBM__)
--add_library(mirplatformgraphicsmesaobjects OBJECT
++add_library(
++  mirplatformgraphicsmesaobjects OBJECT
++
    platform.cpp
    buffer_allocator.cpp
    gbm_buffer.cpp
@@ -38,18 +40,15 @@
    nested_authentication.cpp
+ )
--add_library(mirplatformgraphicsmesa SHARED
++add_library(
++  mirplatformgraphicsmesa MODULE
++
    $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
+ )
--set_target_properties(
--  mirplatformgraphicsmesa PROPERTIES
--  OUTPUT_NAME ${MIR_PLATFORM_DRIVER}
--  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
--  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${server_symbol_map}"
--)
++target_link_libraries(
++  mirplatformgraphicsmesa
--target_link_libraries(mirplatformgraphicsmesa
    mirplatform
    ${Boost_PROGRAM_OPTIONS_LIBRARY}
    ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -58,20 +57,14 @@
    ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
+ )
--install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${PLATFORM_DRIVER}/mesa)
--
--if (MIR_TEST_PLATFORM STREQUAL "mesa")
--  add_custom_command(TARGET mirplatformgraphicsmesa
--    POST_BUILD
--    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_PLATFORM_DRIVER_BINARY}
--    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> ${MIR_PLATFORM_DRIVER_BINARY}
--    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
--  )
--
--  install(CODE
--    "execute_process(
--       COMMAND ln -sf mir/${PLATFORM_DRIVER}/mesa/${MIR_PLATFORM_DRIVER_BINARY}
--       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
--     )"
--  )
--endif()
++set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
++
++set_target_properties(
++  mirplatformgraphicsmesa PROPERTIES
++  OUTPUT_NAME graphics-mesa
++  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
++  PREFIX ""
++  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
++)
++
++install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
 === modified file 'src/platforms/mesa/server/platform.cpp'
 --- src/platforms/mesa/server/platform.cpp	2015-01-22 03:10:13 +0000
 +++ src/platforms/mesa/server/platform.cpp	2015-01-22 15:40:28 +0000
@@ -26,6 +26,7 @@
  #include "mir/options/option.h"
  #include "mir/graphics/native_buffer.h"
  #include "mir/emergency_cleanup_registry.h"
++#include "mir/udev/wrapper.h"
  #include <boost/throw_exception.hpp>
@@ -192,7 +193,7 @@
      return false;
+ }
--extern "C" void add_platform_options(boost::program_options::options_description& config)
++extern "C" void add_graphics_platform_options(boost::program_options::options_description& config)
+ {
      config.add_options()
          (vt_option_name,
@@ -202,3 +203,33 @@
           boost::program_options::value<bool>()->default_value(true),
           "[platform-specific] utilize the bypass optimization for fullscreen surfaces.");
+ }
++
++extern "C" mg::PlatformPriority probe_graphics_platform()
++{
++    auto udev = std::make_shared<mir::udev::Context>();
++
++    mir::udev::Enumerator drm_devices{udev};
++    drm_devices.match_subsystem("drm");
++    drm_devices.match_sysname("card[0-9]*");
++    drm_devices.scan_devices();
++
++    for (auto& device : drm_devices)
++    {
++        static_cast<void>(device);
++        return mg::PlatformPriority::best;
++    }
++
++    return mg::PlatformPriority::unsupported;
++}
++
++mir::ModuleProperties const description = {
++    "mesa",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO
++};
++
++extern "C" mir::ModuleProperties const* describe_graphics_module()
++{
++    return &description;
++}
 === added file 'src/platforms/mesa/server/symbols.map'
 --- src/platforms/mesa/server/symbols.map	1970-01-01 00:00:00 +0000
 +++ src/platforms/mesa/server/symbols.map	2015-01-22 15:40:28 +0000
@@ -0,0 +1,16 @@
++MIR_GRAPHICS_PLATFORM_1 {
++  global:
++    add_graphics_platform_options;
++    create_host_platform;
++    create_guest_platform;
++    probe_graphics_platform;
++    describe_graphics_module;
++  local:
++    *;
++};
++
++# Mesa EGL platform requires this, because madness.
++MIR_MESA_EGL_INTEGRATION {
++  global:
++    mir_server_mesa_egl_native_display_is_valid;
++};
 === modified file 'src/server/CMakeLists.txt'
 --- src/server/CMakeLists.txt	2015-01-20 10:07:15 +0000
 +++ src/server/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -11,6 +11,9 @@
    ${GLIB_INCLUDE_DIRS}
+ )
++add_definitions(-DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}")
++add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
++
  add_subdirectory(compositor/)
  add_subdirectory(graphics/)
  add_subdirectory(input/)
@@ -78,8 +81,9 @@
+ )
  target_link_libraries(mirserver LINK_PUBLIC
++
++  mirclient
    mirplatform
--  mirclient
    mircommon
    mirprotobuf
 rd_party
 === modified file 'src/server/graphics/CMakeLists.txt'
 --- src/server/graphics/CMakeLists.txt	2015-01-16 02:57:31 +0000
 +++ src/server/graphics/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -1,4 +1,4 @@
--include_directories(${GLESv2_INCLUDE_DIRS})
++include_directories(${GLESv2_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
  add_library(
    mirgraphics OBJECT
 === modified file 'src/server/graphics/default_configuration.cpp'
 --- src/server/graphics/default_configuration.cpp	2015-01-16 02:57:31 +0000
 +++ src/server/graphics/default_configuration.cpp	2015-01-22 15:40:28 +0000
@@ -30,10 +30,11 @@
  #include "mir/graphics/gl_config.h"
  #include "mir/graphics/platform.h"
  #include "mir/graphics/cursor.h"
++#include "mir/graphics/platform_probe.h"
  #include "program_factory.h"
  #include "mir/shared_library.h"
--#include "mir/shared_library_loader.h"
++#include "mir/shared_library_prober.h"
  #include "mir/abnormal_exit.h"
  #include "mir/emergency_cleanup.h"
  #include "mir/log.h"
@@ -45,8 +46,15 @@
  #include <map>
  namespace mg = mir::graphics;
++namespace ml = mir::logging;
  namespace mgn = mir::graphics::nested;
++namespace
++{
++// TODO: Temporary, until we actually manage module lifetimes
++static std::shared_ptr<mir::SharedLibrary> platform_library;
++}
++
  std::shared_ptr<mg::DisplayConfigurationPolicy>
  mir::DefaultServerConfiguration::the_display_configuration_policy()
+ {
@@ -65,7 +73,6 @@
      return wrapped;
+ }
--
  namespace
+ {
  //TODO: what is the point of NestedContext if its just the same as mgn:HostConnection?
@@ -102,24 +109,49 @@
      return graphics_platform(
          [this]()->std::shared_ptr<mg::Platform>
+         {
--            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
++            // fallback to standalone if host socket is unset
++            if (the_options()->is_set(options::platform_graphics_lib))
++            {
++                platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
++            }
++            else
++            {
++                auto const& path = the_options()->get<std::string>(options::platform_path);
++                auto platforms = mir::libraries_for_path(path, *the_shared_library_prober_report());
++                if (platforms.empty())
++                {
++                    auto msg = "Failed to find any platform plugins in: " + path;
++                    throw std::runtime_error(msg.c_str());
++                }
++                platform_library = mir::graphics::module_for_device(platforms);
++            }
++            auto create_host_platform = platform_library->load_function<mg::CreateHostPlatform>(
++                "create_host_platform",
++                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
++            auto create_guest_platform = platform_library->load_function<mg::CreateGuestPlatform>(
++                "create_guest_platform",
++                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
++            auto describe_module = platform_library->load_function<mg::DescribeModule>(
++                "describe_graphics_module",
++                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
++            auto description = describe_module();
++            ml::log(ml::Severity::informational,
++                    std::string{"Selected driver: "} + description->name + " (version " +
++                    std::to_string(description->major_version) + "." +
++                    std::to_string(description->minor_version) + "." +
++                    std::to_string(description->micro_version) + ")",
++                    "Platform Loader");
--            auto create_host_platform = graphics_lib->load_function<mg::CreateHostPlatform>("create_host_platform");
--            auto create_guest_platform = graphics_lib->load_function<mg::CreateGuestPlatform>("create_guest_platform");
--            if (the_options()->is_set(options::host_socket_opt))
--            {
++            if (!the_options()->is_set(options::host_socket_opt))
++                return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
++            else
                  return create_guest_platform(
                      the_display_report(),
                      std::make_shared<MirConnectionNestedContext>(the_host_connection()));
--            }
--            else
--            {
--                return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
--            }
++
          });
+ }
--
  std::shared_ptr<mg::GraphicBufferAllocator>
  mir::DefaultServerConfiguration::the_buffer_allocator()
+ {
 === modified file 'src/server/report/default_server_configuration.cpp'
 --- src/server/report/default_server_configuration.cpp	2014-03-06 06:05:17 +0000
 +++ src/server/report/default_server_configuration.cpp	2015-01-22 15:40:28 +0000
@@ -117,3 +117,12 @@
              return report_factory(options::scene_report_opt)->create_scene_report();
          });
+ }
++
++auto mir::DefaultServerConfiguration::the_shared_library_prober_report() -> std::shared_ptr<SharedLibraryProberReport>
++{
++    return shared_library_prober_report(
++        [this]()->std::shared_ptr<SharedLibraryProberReport>
++        {
++            return report_factory(options::shared_library_prober_report_opt)->create_shared_library_prober_report();
++        });
++}
 === modified file 'src/server/report/logging/logging_report_factory.cpp'
 --- src/server/report/logging/logging_report_factory.cpp	2014-02-11 15:18:07 +0000
 +++ src/server/report/logging/logging_report_factory.cpp	2015-01-22 15:40:28 +0000
@@ -25,6 +25,7 @@
  #include "scene_report.h"
  #include "session_mediator_report.h"
  #include "input_report.h"
++#include "mir/logging/shared_library_prober_report.h"
  #include "mir/default_server_configuration.h"
@@ -72,4 +73,8 @@
      return std::make_shared<logging::InputReport>(logger);
+ }
++std::shared_ptr<mir::SharedLibraryProberReport> mr::LoggingReportFactory::create_shared_library_prober_report()
++{
++    return std::make_shared<mir::logging::SharedLibraryProberReport>(logger);
++}
 === modified file 'src/server/report/logging_report_factory.h'
 --- src/server/report/logging_report_factory.h	2014-02-11 15:18:07 +0000
 +++ src/server/report/logging_report_factory.h	2015-01-22 15:40:28 +0000
@@ -47,6 +47,7 @@
      std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
      std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
      std::shared_ptr<input::InputReport> create_input_report() override;
++    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
  private:
      std::shared_ptr<mir::logging::Logger> const logger;
 === modified file 'src/server/report/lttng/CMakeLists.txt'
 --- src/server/report/lttng/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ src/server/report/lttng/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -17,6 +17,7 @@
    session_mediator_report.cpp
    scene_report.cpp
    server_tracepoint_provider.cpp
++  shared_library_prober_report.cpp
+ )
  add_library(
 === modified file 'src/server/report/lttng/lttng_report_factory.cpp'
 --- src/server/report/lttng/lttng_report_factory.cpp	2014-02-11 15:18:07 +0000
 +++ src/server/report/lttng/lttng_report_factory.cpp	2015-01-22 15:40:28 +0000
@@ -25,6 +25,7 @@
  #include "message_processor_report.h"
  #include "scene_report.h"
  #include "session_mediator_report.h"
++#include "shared_library_prober_report.h"
  std::shared_ptr<mir::compositor::CompositorReport> mir::report::LttngReportFactory::create_compositor_report()
+ {
@@ -61,4 +62,9 @@
      return std::make_shared<lttng::InputReport>();
+ }
++std::shared_ptr<mir::SharedLibraryProberReport> mir::report::LttngReportFactory::create_shared_library_prober_report()
++{
++    return std::make_shared<lttng::SharedLibraryProberReport>();
++}
++
 === added file 'src/server/report/lttng/shared_library_prober_report.cpp'
 --- src/server/report/lttng/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
 +++ src/server/report/lttng/shared_library_prober_report.cpp	2015-01-22 15:40:28 +0000
@@ -0,0 +1,52 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#include "shared_library_prober_report.h"
++
++#include "mir/report/lttng/mir_tracepoint.h"
++
++#define TRACEPOINT_DEFINE
++#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
++#include "shared_library_prober_report_tp.h"
++
++namespace mrl = mir::report::lttng;
++namespace bf = boost::filesystem;
++
++void mrl::SharedLibraryProberReport::probing_path(bf::path const& path)
++{
++    mir_tracepoint(mir_server_shared_library_prober, probing_path,
++                   path.string().c_str());
++}
++
++void mrl::SharedLibraryProberReport::probing_failed(bf::path const& path, std::exception const& error)
++{
++    mir_tracepoint(mir_server_shared_library_prober, probing_failed,
++                   path.string().c_str(), error.what());
++}
++
++void mrl::SharedLibraryProberReport::loading_library(bf::path const& filename)
++{
++    mir_tracepoint(mir_server_shared_library_prober, loading_library,
++                   filename.string().c_str());
++}
++
++void mrl::SharedLibraryProberReport::loading_failed(bf::path const& filename, std::exception const& error)
++{
++    mir_tracepoint(mir_server_shared_library_prober, loading_failed,
++                   filename.string().c_str(), error.what());
++}
 === added file 'src/server/report/lttng/shared_library_prober_report.h'
 --- src/server/report/lttng/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
 +++ src/server/report/lttng/shared_library_prober_report.h	2015-01-22 15:40:28 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
++#define MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
++
++#include "server_tracepoint_provider.h"
++#include "mir/shared_library_prober_report.h"
++
++namespace mir
++{
++namespace report
++{
++namespace lttng
++{
++
++class SharedLibraryProberReport : public mir::SharedLibraryProberReport
++{
++public:
++    void probing_path(boost::filesystem::path const& path) override;
++    void probing_failed(boost::filesystem::path const& path, std::exception const& error) override;
++    void loading_library(boost::filesystem::path const& filename) override;
++    void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override;
++
++private:
++    ServerTracepointProvider tp_provider;
++};
++
++}
++}
++}
++
++#endif /* MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ */
 === added file 'src/server/report/lttng/shared_library_prober_report_tp.h'
 --- src/server/report/lttng/shared_library_prober_report_tp.h	1970-01-01 00:00:00 +0000
 +++ src/server/report/lttng/shared_library_prober_report_tp.h	2015-01-22 15:40:28 +0000
@@ -0,0 +1,70 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#undef TRACEPOINT_PROVIDER
++#define TRACEPOINT_PROVIDER mir_server_shared_library_prober
++
++#undef TRACEPOINT_INCLUDE
++#define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h"
++
++#if !defined(MIR_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
++#define MIR_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_
++
++#include "lttng_utils.h"
++
++TRACEPOINT_EVENT(
++    mir_server_shared_library_prober,
++    probing_path,
++    TP_ARGS(const char*, path),
++    TP_FIELDS(
++        ctf_string(path, path)
++    )
++)
++
++TRACEPOINT_EVENT(
++    mir_server_shared_library_prober,
++    probing_failed,
++    TP_ARGS(const char*, path, const char*, message),
++    TP_FIELDS(
++        ctf_string(path, path)
++        ctf_string(message, message)
++    )
++)
++
++TRACEPOINT_EVENT(
++    mir_server_shared_library_prober,
++    loading_library,
++    TP_ARGS(const char*, path),
++    TP_FIELDS(
++        ctf_string(path, path)
++    )
++)
++
++TRACEPOINT_EVENT(
++    mir_server_shared_library_prober,
++    loading_failed,
++    TP_ARGS(const char*, path, const char*, message),
++    TP_FIELDS(
++        ctf_string(path, path)
++        ctf_string(message, message)
++    )
++)
++
++#endif /* MIR_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */
++
++#include <lttng/tracepoint-event.h>
 === modified file 'src/server/report/lttng/tracepoints.c'
 --- src/server/report/lttng/tracepoints.c	2014-02-03 11:44:32 +0000
 +++ src/server/report/lttng/tracepoints.c	2015-01-22 15:40:28 +0000
@@ -8,3 +8,4 @@
  #include "session_mediator_report_tp.h"
  #include "scene_report_tp.h"
  #include "message_processor_report_tp.h"
++#include "shared_library_prober_report_tp.h"
 === modified file 'src/server/report/lttng_report_factory.h'
 --- src/server/report/lttng_report_factory.h	2014-02-11 15:18:07 +0000
 +++ src/server/report/lttng_report_factory.h	2015-01-22 15:40:28 +0000
@@ -35,6 +35,7 @@
      std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
      std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
      std::shared_ptr<input::InputReport> create_input_report() override;
++    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
  };
+ }
+ }
 === modified file 'src/server/report/null/null_report_factory.cpp'
 --- src/server/report/null/null_report_factory.cpp	2014-02-17 22:35:23 +0000
 +++ src/server/report/null/null_report_factory.cpp	2015-01-22 15:40:28 +0000
@@ -25,6 +25,7 @@
  #include "display_report.h"
  #include "input_report.h"
  #include "scene_report.h"
++#include "mir/logging/null_shared_library_prober_report.h"
  std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report()
+ {
@@ -61,11 +62,21 @@
      return std::make_shared<null::InputReport>();
+ }
++std::shared_ptr<mir::SharedLibraryProberReport> mir::report::NullReportFactory::create_shared_library_prober_report()
++{
++    return std::make_shared<logging::NullSharedLibraryProberReport>();
++}
++
  std::shared_ptr<mir::compositor::CompositorReport> mir::report::null_compositor_report()
+ {
      return NullReportFactory{}.create_compositor_report();
+ }
++std::shared_ptr<mir::SharedLibraryProberReport> mir::report::null_shared_library_prober_report()
++{
++    return NullReportFactory{}.create_shared_library_prober_report();
++}
++
  std::shared_ptr<mir::graphics::DisplayReport> mir::report::null_display_report()
+ {
      return NullReportFactory{}.create_display_report();
 === modified file 'src/server/report/null_report_factory.h'
 --- src/server/report/null_report_factory.h	2014-02-17 22:35:23 +0000
 +++ src/server/report/null_report_factory.h	2015-01-22 15:40:28 +0000
@@ -35,6 +35,7 @@
      std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
      std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
      std::shared_ptr<input::InputReport> create_input_report() override;
++    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
  };
  std::shared_ptr<compositor::CompositorReport> null_compositor_report();
@@ -44,6 +45,7 @@
  std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
  std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
  std::shared_ptr<input::InputReport> null_input_report();
++std::shared_ptr<mir::SharedLibraryProberReport> null_shared_library_prober_report();
+ }
+ }
 === modified file 'src/server/report/report_factory.h'
 --- src/server/report/report_factory.h	2014-02-11 15:18:07 +0000
 +++ src/server/report/report_factory.h	2015-01-22 15:40:28 +0000
@@ -23,6 +23,7 @@
  namespace mir
+ {
++class SharedLibraryProberReport;
  namespace compositor
+ {
  class CompositorReport;
@@ -59,6 +60,7 @@
      virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0;
      virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0;
      virtual std::shared_ptr<input::InputReport> create_input_report() = 0;
++    virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0;
  protected:
      ReportFactory() = default;
 === modified file 'src/server/server.cpp'
 --- src/server/server.cpp	2015-01-19 11:40:40 +0000
 +++ src/server/server.cpp	2015-01-22 15:40:28 +0000
@@ -188,12 +188,15 @@
      // TODO this is an ugly frig to avoid exposing the render factory to end users and tests running headless
      auto the_renderer_factory() -> std::shared_ptr<compositor::RendererFactory> override
+     {
--        auto const graphics_lib = the_options()->get<std::string>(options::platform_graphics_lib);
++        auto const& options = the_options();
++        if (options->is_set(options::platform_graphics_lib))
++        {
++            auto const graphics_lib = options->get<std::string>(options::platform_graphics_lib);
--        if (graphics_lib != "libmirplatformstub.so")
--            return mir::DefaultServerConfiguration::the_renderer_factory();
--        else
--            return std::make_shared<StubRendererFactory>();
++            if (graphics_lib.find("graphics-dummy.so") != std::string::npos)
++                return std::make_shared<StubRendererFactory>();
++        }
++        return mir::DefaultServerConfiguration::the_renderer_factory();
+     }
      using mir::DefaultServerConfiguration::the_options;
 === modified file 'src/server/symbols.map'
 --- src/server/symbols.map	2015-01-21 08:38:18 +0000
 +++ src/server/symbols.map	2015-01-22 15:40:28 +0000
@@ -110,6 +110,7 @@
      mir::DefaultServerConfiguration::the_session_event_sink*;
      mir::DefaultServerConfiguration::the_session_listener*;
      mir::DefaultServerConfiguration::the_session_mediator_report*;
++    mir::DefaultServerConfiguration::the_shared_library_prober_report*;
      mir::DefaultServerConfiguration::the_shell_display_layout*;
      mir::DefaultServerConfiguration::the_shell_focus_setter*;
      mir::DefaultServerConfiguration::the_snapshot_strategy*;
@@ -594,6 +595,7 @@
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_event_sink*;
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_listener*;
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_mediator_report*;
++    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shared_library_prober_report*;
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shell_display_layout*;
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shell_focus_setter*;
      non-virtual?thunk?to?mir::DefaultServerConfiguration::the_snapshot_strategy*;
 === modified file 'src/wrapper.c'
 --- src/wrapper.c	2015-01-14 06:39:13 +0000
 +++ src/wrapper.c	2015-01-22 15:40:28 +0000
@@ -46,6 +46,9 @@
      *dest_max = '\0';
      setenv("MIR_CLIENT_PLATFORM_PATH", path, 1);
      printf("MIR_CLIENT_PLATFORM_PATH=%s\n", path);
++    strncpy(pivot+7, "server-modules/", pivot_max-7);
++    setenv("MIR_SERVER_PLATFORM_PATH", path, 1);
++    printf("MIR_SERVER_PLATFORM_PATH=%s\n", path);
      pivot[6] = '\0';  /* truncate lib/client-modules to just lib */
      setenv("LD_LIBRARY_PATH", path, 1);
 === modified file 'tests/acceptance-tests/CMakeLists.txt'
 --- tests/acceptance-tests/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ tests/acceptance-tests/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -4,10 +4,6 @@
    ${CMAKE_SOURCE_DIR}
+ )
--add_definitions(
--  -DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}"
--)
--
  set(
    SOURCES
@@ -67,9 +63,9 @@
    mirplatform
    mir-test
++  mir-test-framework
    mir-test-doubles
    mir-test-doubles-platform
--  mir-test-framework
 rd_party
    ${PROTOBUF_LIBRARIES}
 === modified file 'tests/acceptance-tests/server_configuration_wrapping.cpp'
 --- tests/acceptance-tests/server_configuration_wrapping.cpp	2014-11-06 03:56:24 +0000
 +++ tests/acceptance-tests/server_configuration_wrapping.cpp	2015-01-22 15:40:28 +0000
@@ -21,11 +21,14 @@
  #include "mir_test_framework/headless_test.h"
++#include "mir_test_framework/executable_path.h"
++
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
  namespace ms = mir::scene;
  namespace msh = mir::shell;
++namespace mtf = mir_test_framework;
  using namespace testing;
 === modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
 --- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2015-01-14 06:39:13 +0000
 +++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2015-01-22 15:40:28 +0000
@@ -28,7 +28,7 @@
  TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa)
+ {
--    auto const handle = dlopen((mtf::library_path() + "/client-modules/mesa.so").c_str(), RTLD_LAZY);
++    auto const handle = dlopen(mtf::client_platform("mesa.so").c_str(), RTLD_LAZY);
      ASSERT_THAT(handle, NotNull());
      auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid");
@@ -39,7 +39,7 @@
  TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics)
+ {
--    auto const handle = dlopen(MIR_PLATFORM_DRIVER_BINARY, RTLD_LAZY);
++    auto const handle = dlopen(mtf::server_platform("graphics-mesa.so").c_str(), RTLD_LAZY);
      ASSERT_THAT(handle, NotNull());
      auto const sym = dlsym(handle, "mir_server_mesa_egl_native_display_is_valid");
 === modified file 'tests/include/mir_test_framework/client_platform_factory.h'
 --- tests/include/mir_test_framework/client_platform_factory.h	2015-01-15 15:17:02 +0000
 +++ tests/include/mir_test_framework/client_platform_factory.h	2015-01-22 15:40:28 +0000
@@ -37,7 +37,7 @@
      mtd::MockClientContext ctx;
      ON_CALL(ctx, populate(_))
          .WillByDefault(Invoke([](MirPlatformPackage& package) { ::memset(&package, 0, sizeof(package)); }));
--    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-modules/android.so");
++    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("android.so"));
      auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
      return platform_factory(&ctx);
+ }
@@ -52,7 +52,7 @@
                                    ::memset(&package, 0, sizeof(package));
                                    package.fd_items = 1;
                                }));
--    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-modules/mesa.so");
++    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("mesa.so"));
      auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
      return platform_factory(&ctx);
+ }
 === modified file 'tests/include/mir_test_framework/executable_path.h'
 --- tests/include/mir_test_framework/executable_path.h	2015-01-14 06:39:13 +0000
 +++ tests/include/mir_test_framework/executable_path.h	2015-01-22 15:40:28 +0000
@@ -26,5 +26,7 @@
  std::string executable_path();
  std::string library_path();
++std::string server_platform(std::string const& name);
++std::string client_platform(std::string const& name);
+ }
  #endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */
 === modified file 'tests/include/mir_test_framework/headless_test.h'
 --- tests/include/mir_test_framework/headless_test.h	2015-01-14 06:39:13 +0000
 +++ tests/include/mir_test_framework/headless_test.h	2015-01-22 15:40:28 +0000
@@ -32,7 +32,7 @@
+ {
  /** Basic fixture for tests that don't use graphics hardware.
   *  This provides a mechanism for temporarily setting environment variables.
-- *  It automatically sets "MIR_SERVER_PLATFORM_GRAPHICS_LIB" to "libmirplatformstub.so"
++ *  It automatically sets "MIR_SERVER_PLATFORM_GRAPHICS_LIB" to "graphics-dummy.so"
   *  as the tests do not hit the graphics hardware.
   */
  class HeadlessTest : public ::testing::Test, public AsyncServerRunner
 === added file 'tests/include/mir_test_framework/stub_server_platform_factory.h'
 --- tests/include/mir_test_framework/stub_server_platform_factory.h	1970-01-01 00:00:00 +0000
 +++ tests/include/mir_test_framework/stub_server_platform_factory.h	2015-01-22 15:40:28 +0000
@@ -0,0 +1,49 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#ifndef MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_
++#define MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_
++
++#include "mir/geometry/rectangle.h"
++
++#include "mir/graphics/platform.h"
++#include <vector>
++
++namespace geom = mir::geometry;
++
++namespace mir
++{
++namespace graphics
++{
++class Platform;
++}
++}
++
++namespace mg = mir::graphics;
++
++namespace mir_test_framework
++{
++
++std::shared_ptr<mg::Platform> make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects);
++
++void set_next_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>&& display_rects);
++
++void set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display);
++
++}
++#endif /* MIR_TEST_FRAMEWORK_STUB_SERVER_PLATFORM_FACTORY_ */
 === modified file 'tests/integration-tests/CMakeLists.txt'
 --- tests/integration-tests/CMakeLists.txt	2015-01-21 17:30:44 +0000
 +++ tests/integration-tests/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -99,6 +99,15 @@
    ${GTEST_BOTH_LIBRARIES}
    ${GMOCK_LIBRARY}
    ${GMOCK_MAIN_LIBRARY}
++  # Mesa platform dependencies
++  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
++  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
++  # Android platform dependencies
++  ${LIBHARDWARE_LIBRARIES}
++  ${ANDROID_PROPERTIES_LIBRARIES}
++  # Shared platform dependencies
++  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
++  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
    ${DRM_LDFLAGS} ${DRM_LIBRARIES}
    ${GBM_LDFLAGS} ${GBM_LIBRARIES}
@@ -108,7 +117,7 @@
    ${MIR_SERVER_REFERENCES}
+ )
--if (MIR_TEST_PLATFORM STREQUAL "android")
++if (MIR_BUILD_PLATFORM_ANDROID)
  target_link_libraries(mir_integration_tests
    mirsharedandroid
    ${ANDROID_PROPERTIES_LDFLAGS}
 === modified file 'tests/mir_test_doubles/CMakeLists.txt'
 --- tests/mir_test_doubles/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_doubles/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -31,16 +31,18 @@
+ )
  if (MIR_BUILD_PLATFORM_MESA)
--include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
--list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
--  ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
--  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
--)
++  include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
++  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
++    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
++  )
  endif()
++
  if (MIR_BUILD_PLATFORM_ANDROID)
--list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
--  ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
--)
++  include_directories(SYSTEM ${ANDROID_HEADERS_INCLUDE_DIRS})
++  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
++    ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
++  )
  endif()
  add_library(
 === modified file 'tests/mir_test_framework/CMakeLists.txt'
 --- tests/mir_test_framework/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_framework/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -11,6 +11,11 @@
    ${ANDROID_HEADERS_INCLUDE_DIRS}
+ )
++add_definitions(
++    -DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}"
++    -DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}"
++    )
++
  set(
    TEST_FRAMEWORK_SRCS
@@ -34,6 +39,7 @@
    process.cpp
    using_stub_client_platform.cpp
    stub_client_platform_factory.cpp
++  stub_server_platform_factory.cpp
    udev_environment.cpp
    declarative_placement_strategy.cpp
    fake_event_hub_server_configuration.cpp
@@ -59,8 +65,8 @@
  target_link_libraries(
    mir-test-framework
--  mirplatformstub
 rd_party
++  mir-test-doubles
    ${PROTOBUF_LIBRARIES}
    ${Boost_LIBRARIES}
@@ -94,6 +100,31 @@
    LINK_FLAGS "-Wl,--version-script,${symbol_map}"
+ )
++set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-server.map)
++add_library(
++  mirplatformgraphicsstub MODULE
++
++  platform_graphics_dummy.cpp
++  stubbed_graphics_platform.cpp
++)
++
++target_link_libraries(
++  mirplatformgraphicsstub
++
++  mir-test
++  mir-test-framework
++  mir-test-doubles
++  ${UMOCKDEV_LDFLAGS} ${UMOCKDEV_LIBRARIES}
++)
++
++set_target_properties(
++  mirplatformgraphicsstub PROPERTIES;
++  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
++  OUTPUT_NAME graphics-dummy
++  PREFIX ""
++  LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
++)
++
  add_custom_command(TARGET mir-test-framework POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_directory
    ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings
@@ -105,21 +136,8 @@
    COMMENT "Copying testing cursor themes to build dir..."
+ )
--add_library(
--  mirplatformstub SHARED
--  stubbed_graphics_platform.cpp
--)
--
--target_link_libraries(mirplatformstub
--  mirplatform
--  mir-test-doubles
--  mir-test
--)
--
--set_target_properties(mirplatformstub
--  PROPERTIES
--  LINK_FLAGS "-Wl,--exclude-libs=ALL"
--)
--
--install(TARGETS mirplatformstub LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++string (REPLACE " -Wl,--no-undefined" " " CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
++
++install(TARGETS mirplatformgraphicsstub LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
++
  install(TARGETS mirclientplatformstub LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})
 === modified file 'tests/mir_test_framework/executable_path.cpp'
 --- tests/mir_test_framework/executable_path.cpp	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_framework/executable_path.cpp	2015-01-22 15:40:28 +0000
@@ -24,6 +24,7 @@
  #include <stdexcept>
  #include <boost/throw_exception.hpp>
  #include <boost/exception/errinfo_errno.hpp>
++#include <boost/filesystem.hpp>
  std::string mir_test_framework::executable_path()
+ {
@@ -43,3 +44,29 @@
+ {
      return executable_path() + "/../lib";
+ }
++
++std::string mir_test_framework::server_platform(std::string const& name)
++{
++    for (auto const& option :
++         {library_path() + "/server-modules/", library_path() + "/server-platform/", std::string(MIR_SERVER_PLATFORM_PATH) + '/'})
++    {
++        auto path_to_test = option + name;
++        if (boost::filesystem::exists(path_to_test))
++            return path_to_test;
++    }
++
++    BOOST_THROW_EXCEPTION(std::runtime_error("Failed to find server platform in standard search locations"));
++}
++
++std::string mir_test_framework::client_platform(std::string const& name)
++{
++    for (auto const& option :
++         {library_path() + "/client-modules/", library_path() + "/client-platform/", std::string(MIR_CLIENT_PLATFORM_PATH) + '/'})
++    {
++        auto path_to_test = option + name;
++        if (boost::filesystem::exists(path_to_test))
++            return path_to_test;
++    }
++
++    BOOST_THROW_EXCEPTION(std::runtime_error("Failed to find server platform in standard search locations"));
++}
 === modified file 'tests/mir_test_framework/headless_test.cpp'
 --- tests/mir_test_framework/headless_test.cpp	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_framework/headless_test.cpp	2015-01-22 15:40:28 +0000
@@ -17,52 +17,30 @@
   */
  #include "mir_test_framework/headless_test.h"
++#include "mir_test_framework/stub_server_platform_factory.h"
  #include "mir/shared_library.h"
  #include "mir/geometry/rectangle.h"
++#include "mir_test_framework/executable_path.h"
  #include <boost/throw_exception.hpp>
  namespace geom = mir::geometry;
  namespace mtf = mir_test_framework;
--namespace
--{
--const char* const mir_server_platform_graphics_lib = "MIR_SERVER_PLATFORM_GRAPHICS_LIB";
--
--std::chrono::seconds const timeout{10};
--}
--
  mtf::HeadlessTest::HeadlessTest()
+ {
--    add_to_environment(mir_server_platform_graphics_lib, "libmirplatformstub.so");
++    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", mtf::server_platform("graphics-dummy.so").c_str());
+ }
  mtf::HeadlessTest::~HeadlessTest() noexcept = default;
--
  void mtf::HeadlessTest::preset_display(std::shared_ptr<mir::graphics::Display> const& display)
+ {
--    if (!server_platform_graphics_lib)
--        server_platform_graphics_lib.reset(new mir::SharedLibrary{getenv(mir_server_platform_graphics_lib)});
--
--    typedef void (*PresetDisplay)(std::shared_ptr<mir::graphics::Display> const&);
--
--    auto const preset_display =
--        server_platform_graphics_lib->load_function<PresetDisplay>("preset_display");
--
--    preset_display(display);
++    mtf::set_next_preset_display(display);
+ }
  void mtf::HeadlessTest::initial_display_layout(std::vector<geom::Rectangle> const& display_rects)
+ {
--    if (!server_platform_graphics_lib)
--        server_platform_graphics_lib.reset(new mir::SharedLibrary{getenv(mir_server_platform_graphics_lib)});
--
--    typedef void (*SetDisplayRects)(std::unique_ptr<std::vector<geom::Rectangle>>&&);
--
--    auto const set_display_rects =
--        server_platform_graphics_lib->load_function<SetDisplayRects>("set_display_rects");
--
--    set_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>(new std::vector<geom::Rectangle>(display_rects)));
++    mtf::set_next_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>(new std::vector<geom::Rectangle>(display_rects)));
+ }
 === added file 'tests/mir_test_framework/platform_graphics_dummy.cpp'
 --- tests/mir_test_framework/platform_graphics_dummy.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mir_test_framework/platform_graphics_dummy.cpp	2015-01-22 15:40:28 +0000
@@ -0,0 +1,36 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>>
++ */
++
++#include "mir/graphics/platform.h"
++
++extern "C" mir::graphics::PlatformPriority probe_graphics_platform()
++{
++    return mir::graphics::supported;
++}
++
++mir::ModuleProperties const description {
++    "dummy",
++    MIR_VERSION_MAJOR,
++    MIR_VERSION_MINOR,
++    MIR_VERSION_MICRO
++};
++
++extern "C" mir::ModuleProperties const* describe_graphics_module()
++{
++    return &description;
++}
 === modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
 --- tests/mir_test_framework/stub_client_platform_factory.cpp	2015-01-15 15:17:02 +0000
 +++ tests/mir_test_framework/stub_client_platform_factory.cpp	2015-01-22 15:40:28 +0000
@@ -22,6 +22,7 @@
  #include "mir/client_buffer.h"
  #include "mir/client_platform.h"
++#include <unistd.h>
  #include <string.h>
  namespace mcl = mir::client;
 === added file 'tests/mir_test_framework/stub_server_platform_factory.cpp'
 --- tests/mir_test_framework/stub_server_platform_factory.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mir_test_framework/stub_server_platform_factory.cpp	2015-01-22 15:40:28 +0000
@@ -0,0 +1,72 @@
++
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#include "mir/shared_library.h"
++
++#include "mir/geometry/rectangle.h"
++
++#include "mir_test_framework/executable_path.h"
++#include "mir_test_framework/stub_server_platform_factory.h"
++
++#include <vector>
++
++namespace geom = mir::geometry;
++namespace mg = mir::graphics;
++namespace mtf = mir_test_framework;
++
++namespace
++{
++// NOTE: Raw pointer, deliberately leaked to bypass all the fun
++//       issues around global destructor ordering.
++mir::SharedLibrary* platform_lib{nullptr};
++
++void ensure_platform_library()
++{
++    if (!platform_lib)
++    {
++        platform_lib = new mir::SharedLibrary{mtf::server_platform("graphics-dummy.so")};
++    }
++}
++}
++
++std::shared_ptr<mg::Platform> mtf::make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects)
++{
++    ensure_platform_library();
++    auto factory = platform_lib->load_function<std::shared_ptr<mg::Platform>(*)(std::vector<geom::Rectangle> const&)>("create_stub_platform");
++
++    return factory(display_rects);
++}
++
++void mtf::set_next_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>&& display_rects)
++{
++    ensure_platform_library();
++
++    auto rect_setter = platform_lib->load_function<void(*)(std::unique_ptr<std::vector<geom::Rectangle>>&&)>("set_next_display_rects");
++
++    rect_setter(std::move(display_rects));
++}
++
++void mtf::set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display)
++{
++    ensure_platform_library();
++
++    auto display_setter = platform_lib->load_function<void(*)(std::shared_ptr<mir::graphics::Display> const&)>("set_next_preset_display");
++
++    display_setter(display);
++}
 === modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
 --- tests/mir_test_framework/stubbed_graphics_platform.cpp	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2015-01-22 15:40:28 +0000
@@ -243,8 +243,6 @@
  namespace
+ {
--std::unique_ptr<std::vector<geom::Rectangle>> chosen_display_rects;
--
  struct GuestPlatformAdapter : mg::Platform
+ {
      GuestPlatformAdapter(
@@ -285,6 +283,12 @@
  };
  std::weak_ptr<mg::Platform> the_graphics_platform{};
++std::unique_ptr<std::vector<geom::Rectangle>> chosen_display_rects;
++}
++
++extern "C" std::shared_ptr<mg::Platform> create_stub_platform(std::vector<geom::Rectangle> const& display_rects)
++{
++    return std::make_shared<mtf::StubGraphicPlatform>(display_rects);
+ }
  extern "C" std::shared_ptr<mg::Platform> create_host_platform(
@@ -296,12 +300,12 @@
      if (auto const display_rects = std::move(chosen_display_rects))
+     {
--        result = std::make_shared<mtf::StubGraphicPlatform>(*display_rects);
++        result = create_stub_platform(*display_rects);
+     }
      else
+     {
          static std::vector<geom::Rectangle> const default_display_rects{geom::Rectangle{{0,0},{1600,1600}}};
--        result = std::make_shared<mtf::StubGraphicPlatform>(default_display_rects);
++        result = create_stub_platform(default_display_rects);
+     }
      the_graphics_platform = result;
      return result;
@@ -315,18 +319,18 @@
      return std::make_shared<GuestPlatformAdapter>(context, graphics_platform);
+ }
--extern "C" void add_platform_options(
++extern "C" void add_graphis_platform_options(
      boost::program_options::options_description& /*config*/)
+ {
+ }
--extern "C" void set_display_rects(
++extern "C" void set_next_display_rects(
      std::unique_ptr<std::vector<geom::Rectangle>>&& display_rects)
+ {
      chosen_display_rects = std::move(display_rects);
+ }
--extern "C" void preset_display(std::shared_ptr<mir::graphics::Display> const& display)
++extern "C" void set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display)
+ {
      display_preset = display;
+ }
 === modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
 --- tests/mir_test_framework/stubbed_server_configuration.cpp	2015-01-14 06:39:13 +0000
 +++ tests/mir_test_framework/stubbed_server_configuration.cpp	2015-01-22 15:40:28 +0000
@@ -19,7 +19,7 @@
  #include "mir_test_framework/stubbed_server_configuration.h"
  #include "mir_test_framework/command_line_server_configuration.h"
--#include "stubbed_graphics_platform.h"
++#include "mir_test_framework/stub_server_platform_factory.h"
  #include "mir/options/default_configuration.h"
  #include "mir/graphics/cursor.h"
@@ -92,7 +92,7 @@
+ {
      if (!graphics_platform)
+     {
--        graphics_platform = std::make_shared<StubGraphicPlatform>(display_rects);
++        graphics_platform = mtf::make_stubbed_server_graphics_platform(display_rects);
+     }
      return graphics_platform;
 === added file 'tests/mir_test_framework/symbols-server.map'
 --- tests/mir_test_framework/symbols-server.map	1970-01-01 00:00:00 +0000
 +++ tests/mir_test_framework/symbols-server.map	2015-01-22 15:40:28 +0000
@@ -0,0 +1,8 @@
++MIR_GRAPHICS_PLATFORM_1 {
++  global:
++    add_graphics_platform_options;
++    create_host_platform;
++    create_guest_platform;
++    probe_graphics_platform;
++    describe_graphics_module;
++};
 === modified file 'tests/mir_test_framework/testing_client_options.cpp'
 --- tests/mir_test_framework/testing_client_options.cpp	2015-01-19 04:52:47 +0000
 +++ tests/mir_test_framework/testing_client_options.cpp	2015-01-22 15:40:28 +0000
@@ -16,63 +16,12 @@
   * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
   */
--#include "mir_test_framework/testing_client_configuration.h"
  #include "mir_test_framework/stub_client_connection_configuration.h"
--#include "mir_test_doubles/stub_client_buffer_factory.h"
--#include "mir/options/program_option.h"
  #include "src/client/default_connection_configuration.h"
--#include "mir/client_platform_factory.h"
--#include "mir/client_buffer_factory.h"
--#include "mir/client_buffer.h"
--#include "mir/client_platform.h"
--#include "src/client/mir_connection.h"
++#include "mir_test_framework/stub_client_platform_factory.h"
  namespace mcl = mir::client;
--namespace mtf=mir_test_framework;
--namespace geom = mir::geometry;
--namespace mtd = mir::test::doubles;
--
--namespace
--{
--struct StubClientPlatform : public mcl::ClientPlatform
--{
--    MirPlatformType platform_type() const
--    {
--        return mir_platform_type_gbm;
--    }
--
--    std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
--    {
--        return std::make_shared<mtd::StubClientBufferFactory>();
--    }
--
--    std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*)
--    {
--        auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu);
--        return std::make_shared<EGLNativeWindowType>(fake_window);
--    }
--
--    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
--    {
--        auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu);
--        return std::make_shared<EGLNativeDisplayType>(fake_display);
--    }
--
--    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer*) const
--    {
--        return nullptr;
--    }
--};
--
--struct StubClientPlatformFactory : public mcl::ClientPlatformFactory
--{
--    std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext*)
--    {
--        return std::make_shared<StubClientPlatform>();
--    }
--};
--
--}
++namespace mtf = mir_test_framework;
  mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file)
      : DefaultConnectionConfiguration(socket_file)
 === modified file 'tests/unit-tests/CMakeLists.txt'
 --- tests/unit-tests/CMakeLists.txt	2015-01-22 03:10:13 +0000
 +++ tests/unit-tests/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -1,7 +1,23 @@
  include(CMakeDependentOption)
++add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/")
++
++if (MIR_BUILD_PLATFORM_ANDROID)
++  add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
++endif()
++
++if (MIR_BUILD_PLATFORM_MESA)
++  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
++endif()
++
  include_directories(
    ${CMAKE_SOURCE_DIR}
++
++  ${ANDROID_HEADERS_INCLUDE_DIRS}
++  ${DRM_INCLUDE_DIRS}
++  ${GBM_INCLUDE_DIRS}
++  ${UMOCKDEV_INCLUDE_DIRS}
++
    ${PROJECT_SOURCE_DIR}/src/include/platform
    ${PROJECT_SOURCE_DIR}/src/include/server
    ${PROJECT_SOURCE_DIR}/src/include/client
@@ -10,12 +26,6 @@
    ${GLIB_INCLUDE_DIRS}
+ )
--add_definitions(
--  -DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/"
--  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
--)
--
--include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
  # TODO: Aim to remove
  include_directories(${MIR_XCURSOR_INCLUDE_DIRECTORIES})
@@ -79,9 +89,9 @@
    demo-shell
    mir-test
++  mir-test-framework
    mir-test-doubles
    mir-test-doubles-platform
--  mir-test-framework
 rd_party
@@ -91,6 +101,15 @@
    ${GMOCK_MAIN_LIBRARY}
    ${Boost_LIBRARIES}
    ${UMOCKDEV_LIBRARIES}
++  # Mesa platform dependencies
++  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
++  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
++  # Android platform dependencies
++  ${LIBHARDWARE_LIBRARIES}
++  ${ANDROID_PROPERTIES_LIBRARIES}
++  # Shared platform dependencies
++  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
++  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
    ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
    ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -99,7 +118,7 @@
    ${MIR_SERVER_REFERENCES}
+ )
--if (MIR_TEST_PLATFORM STREQUAL "android")
++if (MIR_BUILD_PLATFORM_ANDROID)
  target_link_libraries(mir_unit_tests
    mirsharedandroid
    ${ANDROID_PROPERTIES_LDFLAGS}
 === modified file 'tests/unit-tests/client/CMakeLists.txt'
 --- tests/unit-tests/client/CMakeLists.txt	2015-01-14 06:39:13 +0000
 +++ tests/unit-tests/client/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -13,6 +13,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_periodic_perf_report.cpp
+ )
 === modified file 'tests/unit-tests/client/test_client_platform.cpp'
 --- tests/unit-tests/client/test_client_platform.cpp	2015-01-19 04:52:47 +0000
 +++ tests/unit-tests/client/test_client_platform.cpp	2015-01-22 15:40:28 +0000
@@ -59,7 +59,7 @@
  struct ClientPlatformTest : public ::testing::TestWithParam<ClientPlatformTraits const*>
+ {
      ClientPlatformTest()
--        : platform_library{mtf::library_path() + "/" + GetParam()->platform_library_name},
++        : platform_library{mtf::client_platform(GetParam()->platform_library_name)},
            create_client_platform{platform_library.load_function<mcl::CreateClientPlatform>("create_client_platform")},
            probe{platform_library.load_function<mcl::ClientPlatformProbe>("is_appropriate_module")}
+     {
@@ -78,7 +78,7 @@
  };
  #ifdef MIR_BUILD_PLATFORM_ANDROID
--ClientPlatformTraits const android_platform{"/client-modules/android.so",
++ClientPlatformTraits const android_platform{"android.so",
                                              [](MirPlatformPackage& pkg)
+                                             {
                                                  ::memset(&pkg, 0, sizeof(pkg));
@@ -93,7 +93,7 @@
  #endif
  #ifdef MIR_BUILD_PLATFORM_MESA
--ClientPlatformTraits const mesa_platform{"/client-modules/mesa.so",
++ClientPlatformTraits const mesa_platform{"mesa.so",
                                           [](MirPlatformPackage& pkg)
+                                          {
                                               ::memset(&pkg, 0, sizeof(pkg));
@@ -108,7 +108,7 @@
  #endif
--ClientPlatformTraits const dummy_platform{"/client-modules/dummy.so",
++ClientPlatformTraits const dummy_platform{"dummy.so",
                                            [](MirPlatformPackage& pkg)
+                                           {
                                                mtf::create_stub_platform_package(pkg);
 === modified file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
 --- tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-01-15 15:17:02 +0000
 +++ tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-01-22 15:40:28 +0000
@@ -36,10 +36,10 @@
+ {
      std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
  #ifdef MIR_BUILD_PLATFORM_MESA
--    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/mesa.so"));
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("mesa.so")));
  #endif
  #ifdef MIR_BUILD_PLATFORM_ANDROID
--    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/android.so"));
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("android.so")));
  #endif
      return modules;
+ }
@@ -127,7 +127,7 @@
      auto modules = all_available_modules();
      // NOTE: For minimum fuss, load something that has minimal side-effects...
      modules.push_back(std::make_shared<mir::SharedLibrary>("libc.so.6"));
--    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/dummy.so"));
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("dummy.so")));
      mir::client::ProbingClientPlatformFactory factory{modules};
 === modified file 'tests/unit-tests/graphics/CMakeLists.txt'
 --- tests/unit-tests/graphics/CMakeLists.txt	2015-01-16 02:57:31 +0000
 +++ tests/unit-tests/graphics/CMakeLists.txt	2015-01-22 15:40:28 +0000
@@ -10,6 +10,7 @@
      ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/test_program_factory.cpp
++    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_prober.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/test_software_cursor.cpp
+ )
 === modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
 --- tests/unit-tests/graphics/android/test_platform.cpp	2015-01-22 03:10:13 +0000
 +++ tests/unit-tests/graphics/android/test_platform.cpp	2015-01-22 15:40:28 +0000
@@ -28,6 +28,8 @@
  #include "mir_test_doubles/fd_matcher.h"
  #include "mir_test/fake_shared.h"
  #include "mir_test_doubles/mock_android_native_buffer.h"
++#include "mir_test_framework/executable_path.h"
++#include "mir/shared_library.h"
  #include <system/window.h>
  #include <gtest/gtest.h>
@@ -38,6 +40,9 @@
  namespace mr=mir::report;
  namespace geom=mir::geometry;
  namespace mo=mir::options;
++namespace mtf=mir_test_framework;
++
++static const char probe_platform[] = "probe_graphics_platform";
  class PlatformBufferIPCPackaging : public ::testing::Test
+ {
@@ -227,6 +232,27 @@
      EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
+ }
++TEST(AndroidGraphicsPlatform, probe_returns_unsupported_when_no_hwaccess)
++{
++    using namespace testing;
++    NiceMock<mtd::HardwareAccessMock> hwaccess;
++
++    ON_CALL(hwaccess, hw_get_module(_,_)).WillByDefault(Return(-1));
++
++    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android.so")};
++    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
++    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
++}
++
++TEST(AndroidGraphicsPlatform, probe_returns_best_when_hwaccess_succeeds)
++{
++    testing::NiceMock<mtd::HardwareAccessMock> hwaccess;
++
++    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android.so")};
++    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
++    EXPECT_EQ(mg::PlatformPriority::best, probe());
++}
++
  TEST(NestedPlatformCreation, doesnt_access_display_hardware)
+ {
      using namespace testing;
 === modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
 --- tests/unit-tests/graphics/mesa/test_platform.cpp	2015-01-22 03:10:13 +0000
 +++ tests/unit-tests/graphics/mesa/test_platform.cpp	2015-01-22 15:40:28 +0000
@@ -23,6 +23,7 @@
  #include "src/platforms/mesa/server/platform.h"
  #include "src/server/report/null_report_factory.h"
  #include "mir/emergency_cleanup_registry.h"
++#include "mir/shared_library.h"
  #include "mir_test_doubles/mock_buffer.h"
  #include "mir_test_doubles/mock_buffer_ipc_message.h"
@@ -33,6 +34,7 @@
  #include <gtest/gtest.h>
  #include "mir_test_framework/udev_environment.h"
++#include "mir_test_framework/executable_path.h"
  #include "mir_test/pipe.h"
  #include "mir_test_doubles/mock_drm.h"
@@ -55,6 +57,8 @@
  namespace
+ {
++const char probe_platform[] = "probe_graphics_platform";
++
  class MesaGraphicsPlatform : public ::testing::Test
+ {
  public:
@@ -338,3 +342,23 @@
      Mock::VerifyAndClearExpectations(&mock_drm);
+ }
++
++TEST_F(MesaGraphicsPlatform, probe_returns_unsupported_when_no_drm_udev_devices)
++{
++    mtf::UdevEnvironment udev_environment;
++
++    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa.so")};
++    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
++    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
++}
++
++TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_exist)
++{
++    mtf::UdevEnvironment udev_environment;
++
++    udev_environment.add_standard_device("standard-drm-devices");
++
++    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa.so")};
++    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
++    EXPECT_EQ(mg::PlatformPriority::best, probe());
++}
 === added file 'tests/unit-tests/graphics/test_platform_prober.cpp'
 --- tests/unit-tests/graphics/test_platform_prober.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit-tests/graphics/test_platform_prober.cpp	2015-01-22 15:40:28 +0000
@@ -0,0 +1,215 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
++ */
++
++#include <gtest/gtest.h>
++
++#include "mir/graphics/platform.h"
++#include "mir/graphics/platform_probe.h"
++
++#include "mir/raii.h"
++
++#ifdef MIR_BUILD_PLATFORM_MESA
++#include "mir_test_doubles/mock_drm.h"
++#include "mir_test_doubles/mock_gbm.h"
++#endif
++
++#ifdef MIR_BUILD_PLATFORM_ANDROID
++#include "mir_test_doubles/mock_android_hw.h"
++#endif
++
++#include "mir_test_framework/udev_environment.h"
++#include "mir_test_framework/executable_path.h"
++
++namespace mtf = mir_test_framework;
++namespace mtd = mir::test::doubles;
++
++namespace
++{
++const char describe_module[] = "describe_graphics_module";
++
++std::vector<std::shared_ptr<mir::SharedLibrary>> available_platforms()
++{
++    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
++
++#ifdef MIR_BUILD_PLATFORM_MESA
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-mesa.so")));
++#endif
++#ifdef MIR_BUILD_PLATFORM_ANDROID
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-android.so")));
++#endif
++    return modules;
++}
++
++void add_dummy_platform(std::vector<std::shared_ptr<mir::SharedLibrary>>& modules)
++{
++    modules.insert(modules.begin(), std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-dummy.so")));
++}
++
++std::shared_ptr<void> ensure_android_probing_fails()
++{
++#ifdef MIR_BUILD_PLATFORM_ANDROID
++    using namespace testing;
++    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
++    ON_CALL(*mock_android, hw_get_module(_, _))
++       .WillByDefault(Return(-1));
++    return mock_android;
++#else
++    return std::shared_ptr<void>{};
++#endif
++}
++
++std::shared_ptr<void> ensure_mesa_probing_fails()
++{
++    return std::make_shared<mtf::UdevEnvironment>();
++}
++
++std::shared_ptr<void> ensure_mesa_probing_succeeds()
++{
++    auto udev = std::make_shared<mtf::UdevEnvironment>();
++
++    udev->add_standard_device("standard-drm-devices");
++
++    return udev;
++}
++
++std::shared_ptr<void> ensure_android_probing_succeeds()
++{
++#ifdef MIR_BUILD_PLATFORM_ANDROID
++    using namespace testing;
++    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
++    ON_CALL(*mock_android, hw_get_module(_, _))
++       .WillByDefault(Return(0));
++    return mock_android;
++#else
++    return std::shared_ptr<void>{};
++#endif
++}
++}
++
++TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
++{
++    std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
++    EXPECT_THROW(mir::graphics::module_for_device(empty_modules),
++                 std::runtime_error);
++}
++
++#ifdef MIR_BUILD_PLATFORM_MESA
++TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
++{
++    using namespace testing;
++    auto block_android = ensure_android_probing_fails();
++    auto fake_mesa = ensure_mesa_probing_succeeds();
++
++    auto modules = available_platforms();
++
++    auto module = mir::graphics::module_for_device(modules);
++    ASSERT_NE(nullptr, module);
++
++    auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
++    auto description = descriptor();
++
++    EXPECT_THAT(description->name, HasSubstr("mesa"));
++}
++#endif
++
++#ifdef MIR_BUILD_PLATFORM_ANDROID
++TEST(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds)
++{
++    using namespace testing;
++
++    auto block_mesa = ensure_mesa_probing_fails();
++    auto fake_android = ensure_android_probing_succeeds();
++
++    auto modules = available_platforms();
++
++    auto module = mir::graphics::module_for_device(modules);
++    ASSERT_NE(nullptr, module);
++
++    auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
++    auto description = descriptor();
++
++    EXPECT_THAT(description->name, HasSubstr("android"));
++}
++#endif
++
++TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
++{
++    using namespace testing;
++    auto block_android = ensure_android_probing_fails();
++    auto block_mesa = ensure_mesa_probing_fails();
++
++
++    EXPECT_THROW(mir::graphics::module_for_device(available_platforms()),
++                 std::runtime_error);
++}
++
++TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
++{
++    using namespace testing;
++    auto block_android = ensure_android_probing_fails();
++    auto block_mesa = ensure_mesa_probing_fails();
++
++    auto modules = available_platforms();
++    add_dummy_platform(modules);
++
++    auto module = mir::graphics::module_for_device(modules);
++    ASSERT_NE(nullptr, module);
++
++    auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
++    auto description = descriptor();
++
++    EXPECT_THAT(description->name, HasSubstr("dummy"));
++}
++
++TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
++{
++    using namespace testing;
++
++    auto ensure_mesa = ensure_mesa_probing_succeeds();
++    auto ensure_android = ensure_android_probing_succeeds();
++
++    auto modules = available_platforms();
++    add_dummy_platform(modules);
++
++    auto module = mir::graphics::module_for_device(modules);
++    ASSERT_NE(nullptr, module);
++
++    auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
++    auto description = descriptor();
++
++    EXPECT_THAT(description->name, Not(HasSubstr("dummy")));
++}
++
++TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
++{
++    using namespace testing;
++
++    auto ensure_mesa = ensure_mesa_probing_succeeds();
++    auto ensure_android = ensure_android_probing_succeeds();
++
++    auto modules = available_platforms();
++    add_dummy_platform(modules);
++
++    // NOTE: We want to load something that doesn't link with libmirplatform,
++    // due to protobuf throwing a screaming hissy fit if it gets loaded twice.
++    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("dummy.so")));
++
++
++    auto module = mir::graphics::module_for_device(modules);
++    EXPECT_NE(nullptr, module);
++}
 === modified file 'tests/unit-tests/shared_library_test.cpp'
 --- tests/unit-tests/shared_library_test.cpp	2015-01-14 06:39:13 +0000
 +++ tests/unit-tests/shared_library_test.cpp	2015-01-22 15:40:28 +0000
@@ -59,7 +59,7 @@
  public:
      SharedLibrary()
          : nonexistent_library{"imma_totally_not_a_library"},
--          existing_library{mtf::library_path() + "/client-modules/mesa.so"},
++          existing_library{mtf::client_platform("mesa.so")},
            nonexistent_function{"yo_dawg"},
            existing_function{"create_client_platform"},
            existent_version{"MIR_CLIENT_PLATFORM_2"},
 === modified file 'tools/install_on_android.sh'
 --- tools/install_on_android.sh	2015-01-14 06:39:13 +0000
 +++ tools/install_on_android.sh	2015-01-22 15:40:28 +0000
@@ -32,11 +32,11 @@
               lib/libmirclient.so.* \
               lib/libmircommon.so.* \
               lib/libmirplatform.so.* \
--             lib/libmirplatform*driver.so \
--             lib/libmirclient*driver.so \
++             lib/platform-graphics-dummy.so \
++             lib/client-modules/* \
++             lib/server-modules/* \
               lib/libmirprotobuf.so.* \
               lib/libmirclient-debug-extension.so.* \
--             lib/libmirplatformstub.so \
               lib/libmirserver.so.*
      do
          adb push $x ${RUN_DIR}
 === modified file 'tools/valgrind_suppressions_armhf'
 --- tools/valgrind_suppressions_armhf	2015-01-14 06:39:13 +0000
 +++ tools/valgrind_suppressions_armhf	2015-01-22 15:40:28 +0000
@@ -127,6 +127,15 @@
  # memory errors.
+ {
++   spurious_strlen_addr4
++   Memcheck:Addr4
++   ...
++   fun:dlsym
++   ...
++   fun:_ZN50SharedLibrary_load_nonexistent_function_fails_Test8TestBodyEv
++}
++
++{
      mir_sharedlibrary_cond
      Memcheck:Cond
      fun:_ZN3mir13SharedLibraryC1EPKc