Merge lp:~raof/mir/privatise-all-the-things into lp:mir
- privatise-all-the-things
- Merge into development-branch
Proposed by
Chris Halse Rogers
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~raof/mir/privatise-all-the-things |
| Merge into: | lp:mir |
| Diff against target: |
5047 lines (+2580/-573) (has conflicts) 123 files modified
CMakeLists.txt (+4/-2) client-ABI-sha1sums (+1/-1) common-ABI-sha1sums (+5/-1) debian/control (+7/-12) debian/create_postinst_prerm_scripts.sh (+0/-39) debian/install_ld_so_conf.sh (+0/-26) debian/mir-client-platform-android-1.install (+1/-1) debian/mir-client-platform-mesa-1.install (+1/-1) debian/mir-platform-graphics-android-1.install (+1/-1) debian/mir-platform-graphics-mesa-1.install (+1/-1) debian/rules (+0/-11) debian/update-alternatives.postinst.in (+0/-18) debian/update-alternatives.prerm.in (+0/-16) include/platform/mir/graphics/platform.h (+36/-0) include/platform/mir/options/configuration.h (+2/-0) include/platform/mir/shared_library_loader.h (+0/-28) include/server/mir/default_server_configuration.h (+3/-0) include/shared/mir/logging/null_shared_library_prober_report.h (+49/-0) include/shared/mir/logging/shared_library_prober_report.h (+48/-0) include/shared/mir/shared_library_prober.h (+36/-0) include/shared/mir/shared_library_prober_report.h (+44/-0) include/shared/mir_toolkit/mesa/native_display.h (+3/-3) include/test/mir_test_doubles/mock_android_alloc_device.h (+5/-0) include/test/mir_test_doubles/mock_android_hw.h (+5/-0) include/test/mir_test_doubles/mock_hwc_composer_device_1.h (+5/-0) include/test/mir_test_framework/client_platform_factory.h (+72/-0) include/test/mir_test_framework/executable_path.h (+2/-0) include/test/mir_test_framework/stub_client_platform_factory.h (+33/-0) platform-ABI-sha1sums (+7/-4) server-ABI-sha1sums (+8/-5) src/client/CMakeLists.txt (+14/-11) src/client/android/CMakeLists.txt (+6/-22) src/client/android/android_native_display_container.cpp (+16/-4) src/client/android/android_native_display_container.h (+8/-1) src/client/android/client_platform_factory.cpp (+21/-5) src/client/android/client_platform_factory.h (+2/-5) src/client/android/symbols.map (+2/-1) src/client/client_platform_factory.h (+5/-2) src/client/default_connection_configuration.cpp (+51/-0) src/client/default_connection_configuration.h (+7/-0) src/client/egl_native_display_container.h (+3/-1) src/client/lttng/CMakeLists.txt (+1/-0) src/client/lttng/shared_library_prober_report.cpp (+50/-0) src/client/lttng/shared_library_prober_report.h (+55/-0) src/client/lttng/shared_library_prober_report_tp.h (+85/-0) src/client/mesa/CMakeLists.txt (+5/-22) src/client/mesa/client_platform.cpp (+1/-1) src/client/mesa/client_platform_factory.cpp (+20/-6) src/client/mesa/client_platform_factory.h (+0/-5) src/client/mesa/mesa_native_display_container.cpp (+5/-5) src/client/mesa/mesa_native_display_container.h (+1/-1) src/client/mesa/native_surface.cpp (+0/-1) src/client/mesa/symbols.map (+4/-2) src/client/mir_connection.cpp (+7/-3) src/client/mir_connection.h (+3/-1) src/client/probing_client_platform_factory.cpp (+29/-0) src/client/probing_client_platform_factory.h (+27/-0) src/platform/CMakeLists.txt (+17/-6) src/platform/graphics/CMakeLists.txt (+1/-0) src/platform/graphics/android/CMakeLists.txt (+15/-25) src/platform/graphics/android/android_platform.cpp (+23/-0) src/platform/graphics/android/symbols.map (+8/-0) src/platform/graphics/mesa/CMakeLists.txt (+18/-27) src/platform/graphics/mesa/platform.cpp (+28/-0) src/platform/graphics/mesa/symbols.map (+8/-0) src/platform/graphics/platform_probe.cpp (+42/-0) src/platform/graphics/platform_probe.h (+37/-0) src/platform/options/default_configuration.cpp (+67/-17) src/platform/shared_library_loader.cpp (+0/-38) src/platform/symbols.map (+3/-0) src/server/CMakeLists.txt (+4/-1) src/server/graphics/CMakeLists.txt (+1/-1) src/server/graphics/default_configuration.cpp (+37/-6) src/server/logging/CMakeLists.txt (+0/-1) src/server/report/default_server_configuration.cpp (+9/-0) src/server/report/logging/CMakeLists.txt (+0/-1) src/server/report/logging/logging_report_factory.cpp (+5/-1) src/server/report/logging_report_factory.h (+2/-0) src/server/report/lttng/CMakeLists.txt (+1/-0) src/server/report/lttng/lttng_report_factory.cpp (+5/-0) src/server/report/lttng/shared_library_prober_report.cpp (+48/-0) src/server/report/lttng/shared_library_prober_report.h (+52/-0) src/server/report/lttng/shared_library_prober_report_tp.h (+71/-0) src/server/report/lttng_report_factory.h (+1/-0) src/server/report/null/CMakeLists.txt (+1/-0) src/server/report/null/null_report_factory.cpp (+11/-0) src/server/report/null/shared_library_prober_report.cpp (+35/-0) src/server/report/null/shared_library_prober_report.h (+43/-0) src/server/report/null_report_factory.h (+2/-1) src/server/report/report_factory.h (+3/-0) src/shared/graphics/android/mir_native_window.cpp (+0/-1) src/shared/logging/CMakeLists.txt (+2/-1) src/shared/logging/shared_library_prober_report.cpp (+58/-0) src/shared/sharedlibrary/CMakeLists.txt (+5/-1) src/shared/sharedlibrary/shared_library_prober.cpp (+63/-0) src/shared/symbols.map (+9/-0) tests/acceptance-tests/CMakeLists.txt (+3/-1) tests/acceptance-tests/test_symbols_required_by_mesa.cpp (+3/-3) tests/integration-tests/CMakeLists.txt (+21/-2) tests/mir_test_doubles/CMakeLists.txt (+13/-10) tests/mir_test_framework/CMakeLists.txt (+38/-0) tests/mir_test_framework/executable_path.cpp (+5/-0) tests/mir_test_framework/platform_graphics_dummy.cpp (+33/-0) tests/mir_test_framework/stub_client_platform_factory.cpp (+143/-0) tests/mir_test_framework/stub_client_platform_module.cpp (+35/-0) tests/mir_test_framework/symbols-client.map (+7/-0) tests/mir_test_framework/symbols-server.map (+10/-0) tests/mir_test_framework/testing_client_options.cpp (+2/-102) tests/unit-tests/CMakeLists.txt (+42/-3) tests/unit-tests/client/CMakeLists.txt (+1/-0) tests/unit-tests/client/android/test_android_client_platform.cpp (+4/-7) tests/unit-tests/client/mesa/test_client_platform.cpp (+7/-6) tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp (+1/-1) tests/unit-tests/client/test_client_platform.cpp (+109/-29) tests/unit-tests/client/test_probing_client_platform_factory.cpp (+116/-0) tests/unit-tests/graphics/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/android/test_android_platform.cpp (+24/-0) tests/unit-tests/graphics/android/test_output_builder.cpp (+2/-1) tests/unit-tests/graphics/mesa/test_platform.cpp (+22/-0) tests/unit-tests/graphics/test_platform_prober.cpp (+194/-0) tests/unit-tests/shared_library_test.cpp (+28/-11) tests/unit-tests/test_shared_library_prober.cpp (+165/-0) tools/valgrind_suppressions_armhf (+9/-0) Text conflict in src/client/default_connection_configuration.cpp Text conflict in src/client/default_connection_configuration.h |
| To merge this branch: | bzr merge lp:~raof/mir/privatise-all-the-things |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Needs Resubmitting | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alan Griffiths | Abstain | ||
| Alexandros Frantzis (community) | Abstain | ||
| Kevin DuBois (community) | Needs Information | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-08-29.
Commit message
Move the platform plugins into a private directory, versioned with the relevant ABI.
Together with Alan's versioning of libmirplatform, makes different versions of Mir parallel installable again.
Description of the change
Move the platform plugins into a private directory, versioned with the relevant ABI.
There are some obvious TODOs here, but none seem super-urgent:
*) Actually managing the lifetime of our platform plugins rather than just keeping them around indefinitely
*) Defining an ABI we expose to platform plugins and then sticking them in an unversioned directory.
*) Loading the specific version of the ABI we expect via dlvsym.
Things that I'll do as an immediate follow-on branch:
*) Logging for platform module probing
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
How does removing libmirplatform fits with our "platform" story?
AIUI libmirplatform is the LGPL foundation (establishing common interfaces & types) that both a propitiatory platform implementation and the GPL libmirserver link against.
How is that seen to work after these changes?
review:
Needs Information
Revision history for this message
| Alexandros Frantzis (afrantzis) wrote : | # |
Besides the conflicts:
42 +Package: libmirplatformg
Debian packaging guidelines mandate lib<name><version>, so e.g. libmirclientpla
225 -override_
231 -override_
787 + // TODO: Some sort of probe so we have some guarantee that
We need to check if removing alternatives support breaks the emulator use case (which was the driving force behing it). In general, until we have a smart enough probe, we either need to allow setting a sensible system-wide default (that's what the current alternatives system does), or disallow installing the mesa/android packages at the same time (which somewhat defeats the purpose of this MP).
2173 +std::list<
Prefer vector<> by default (not that it will makes any performance different in this case).
review:
Needs Fixing
Revision history for this message
| Kevin DuBois (kdub) wrote : | # |
the define MIR_SERVER_
review:
Needs Information
Revision history for this message
| Chris Halse Rogers (raof) wrote : | # |
> How does removing libmirplatform fits with our "platform" story?
>
> AIUI libmirplatform is the LGPL foundation (establishing common interfaces &
> types) that both a propitiatory platform implementation and the GPL
> libmirserver link against.
>
> How is that seen to work after these changes?
Roughly the same as it was working before these changes - if, for example, you check out libmirplatform in trunk then you'll see it exports a single symbol - mir::load_library - which I removed and then noticed that nothing was actually linked against libmirplatform (because we pass the linker flag to only link against things that we use symbols from).
Thinking of which, have we checked with our lawyers and/or NVIDIA's/AMD's lawyers about this? The situation is more like loadable modules in the kernel rather than traditional dynamic linking, and it'd be nice to be clearer about our expectations than the kernel is.
> Besides the conflicts:
>
> 42 +Package: libmirplatformg
>
> Debian packaging guidelines mandate lib<name><version>, so e.g.
> libmirclientpla
> version is only used if the name ends with a number.
Ah, yeah. I'll actually go the other way - this isn't a shared library, it's a module, so I'll rename it mir-platform-
> 787 + // TODO: Some sort of probe so we have some guarantee that
>
> We need to check if removing alternatives support breaks the emulator use case
> (which was the driving force behing it). In general, until we have a smart
> enough probe, we either need to allow setting a sensible system-wide default
> (that's what the current alternatives system does), or disallow installing the
> mesa/android packages at the same time (which somewhat defeats the purpose of
> this MP).
It shouldn't be too hard to get a basic probe up and running. I'll do so.
>
> 2173 +std::list<
>
> Prefer vector<> by default (not that it will makes any performance different
> in this case).
Ah, yeah. This was a holdover of trying to use raw mir::SharedLibrary which isn't default-
> the define MIR_SERVER_
> the various cross compiling methods floating around. Could we use a some
> default paths instead?
I'm not entirely clear what you're concerned about here. Is your concern about testability? That should be mitigated by the MIR_CLIENT_
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
> > How does removing libmirplatform fits with our "platform" story?
> >
> > AIUI libmirplatform is the LGPL foundation (establishing common interfaces &
> > types) that both a propitiatory platform implementation and the GPL
> > libmirserver link against.
> >
> > How is that seen to work after these changes?
>
> Roughly the same as it was working before these changes - if, for example, you
> check out libmirplatform in trunk then you'll see it exports a single symbol -
> mir::load_library - which I removed and then noticed that nothing was actually
> linked against libmirplatform (because we pass the linker flag to only link
> against things that we use symbols from).
>
> Thinking of which, have we checked with our lawyers and/or NVIDIA's/AMD's
> lawyers about this? The situation is more like loadable modules in the kernel
> rather than traditional dynamic linking, and it'd be nice to be clearer about
> our expectations than the kernel is.
I wasn't party to the conversations with lawyers, I'm going on what kgunn told us.
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
> Roughly the same as it was working before these changes - if, for example, you
> check out libmirplatform in trunk then you'll see it exports a single symbol -
> mir::load_library - which I removed and then noticed that nothing was actually
> linked against libmirplatform (because we pass the linker flag to only link
> against things that we use symbols from).
That bug and has been fixed on development-branch (-r 1786)
Revision history for this message
| Chris Halse Rogers (raof) wrote : | # |
Moving to WIP: probing is taking a little longer than expected. Hah!
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
Interesting approach. Not a complete review but:
1607 +#include <iostream>
Not needed
~~~~
3961 -#ifdef ANDROID
3962 #include "mir_test_
3963 -#include "src/client/
Causes FTBFS for me on desktop:
include/
#include <hardware/
compilation terminated.
review:
Needs Fixing
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1826
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1827. By Chris Halse Rogers
-
Fix the build and the tests when not building the Andorid platform
- 1828. By Chris Halse Rogers
-
Add a --platform-
graphics- path option. This makes it easier to test the full stack without installing it, and
is the sort of thing people are going to reasonable expect in a configuration
file. - 1829. By Chris Halse Rogers
-
Drop noexcept from create_platform declaration.
Since we're returning a std::shared_ptr<> we're pretty much guaranteed that both sides
of this call are actually C++, and can deal with exceptions.This means we need to expose all the necessary symbols for exception propagation and
so on, so drop the local: catch-all clause from the modules' symbols.map
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1827
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1830. By Chris Halse Rogers
-
Merge trunk
- 1831. By Chris Halse Rogers
-
Fix licensing for server → platform move of platform_probe.*
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1829
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1831
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1832. By Chris Halse Rogers
-
Include <iostream> less
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1832
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1833. By Chris Halse Rogers
-
Babysit Google Test a bit.
Apparently ::testing::Values() is confused by being handed a list of objects,
resulting in Valgrind errors. Fix this by constructing a list of
ClientPlatformTraits* pointing to the globals instead.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1833
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1834. By Chris Halse Rogers
-
Suppress just a little more armhf valgrind wackiness
- 1835. By Chris Halse Rogers
-
Probe client platform modules before attempting to create a ClientPlatform
Exceptions aren't flow-control constructs, this will allow platforms to *actually* throw
an exception if ClientPlatform construction unexpectedly fails, and resolves a weird
leak found by valgrind that's probably to do with exception throwing across DSOs without
appropriate symbol exports.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1835
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1836. By Chris Halse Rogers
-
Merge trunk, resolve conflicts
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1836
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1837. By Chris Halse Rogers
-
Also add is_appropriate_
module to stub client platform
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1837
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alexandros Frantzis (afrantzis) : | # |
review:
Abstain
Revision history for this message
| Alexandros Frantzis (afrantzis) wrote : | # |
Didn't get a chance to review properly.
- 1838. By Chris Halse Rogers
-
Merge trunk
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1838
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1839. By Chris Halse Rogers
-
Be smarter about the client platform tests.
We can instantiate the parametrised multiple times, so do it individually for Mesa and Android
if they're built, rather than testing the dummy for each platform not built. The dummy platform
is not yet sufficiently dummy to work properly here.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1839
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alan Griffiths (alan-griffiths) wrote : | # |
> [0;32m[ RUN ] [mSurfaceLoop.
> Build timed out (after 60 minutes). Marking the build as failed.
Sometimes tests hang. Sometimes CI is this slow. Who knows?!
~~~~
1204 +std::shared_
Having recently tracked down several problems caused by namespace scoped objects with state I'm concerned that this may be fragile.
~~~~
Triggering rebuild to see if it it gets through CI - will come back for a closer look later.
review:
Abstain
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1839
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1840. By Chris Halse Rogers
-
Merge trunk
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1840
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1841. By Chris Halse Rogers
-
Update SHAsums
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1841
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1842. By Chris Halse Rogers
-
Select the right client platform for integration tests.
The Android integration tests have some Android-specific tests that need a real client platform,
so give it to them.Conversely, the Mesa client platform cannot load in the integration test environment, as they need
a real platform package.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1842
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1843. By Chris Halse Rogers
-
Default to logging our choice of platform library.
This is both so I can see what the hell's happening in CI, but is also
a reasonable default¹. Who wants to receive bug reports where we don't know
what platform libraries are being loaded?¹: For the server, certainly. Less reasonable for the client, until we make
the client log hookable.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1843
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1844. By Chris Halse Rogers
-
Merge trunk
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1844
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
Minor suggestion: Try reverting all the blank line changes. That will get the diff size down to below the 5000 line limit so Launchpad will display it all.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1844
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1845. By Chris Halse Rogers
-
Revert the switch to logging by default.
They're not currently as useful as I thought; I'll switch them back on
in the follow-up branch where they *are* more useful ☺
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1844
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1846. By Chris Halse Rogers
-
Merge trunk
- 1847. By Chris Halse Rogers
-
Add new entries to mircommon symbols.map
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1845
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1847
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1845
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Chris Halse Rogers (raof) wrote : | # |
Ok. I don't know what's going on with CI.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1845
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:1845
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) wrote : | # |
I suggest trying to shrink the diff down to 5000 lines so LP will not truncate it. Also resubmit because the above CI madness is making things confusing.
review:
Needs Resubmitting
- 1848. By Chris Halse Rogers
-
Merge trunk
- 1849. By Chris Halse Rogers
-
Merge library-prober as a prerequisite
- 1850. By Chris Halse Rogers
-
Update sha1sums
- 1851. By Chris Halse Rogers
-
Remerge prerequisite
- 1852. By Chris Halse Rogers
-
♪ Merge merge merge your prereq gently down the stream ♫
- 1853. By Chris Halse Rogers
-
Stub client library doesn't need to link to mir-test-framework
Fixes failure to build on i386-android-
cross-compile - 1854. By Chris Halse Rogers
-
Merge versioned-
shared- library work - 1855. By Chris Halse Rogers
-
Make ProbingClientFa
ctory ignore non-client-platform modules. You shouldn't be installing non-client platform modules in the client platform path,
but that's no reason not to be robust against it - 1856. By Chris Halse Rogers
-
Remove some detritus
- 1857. By Chris Halse Rogers
-
Define CLIENT_PLATFORM_API instead of the client module path
- 1858. By Chris Halse Rogers
-
Also make module_for_device ignore non-server-platform modules.
Again, there's no reason not to be robust against this
- 1859. By Chris Halse Rogers
-
Load the specific platform version we're expecting.
There's no particular reason not to do this now, and it's a bit of safety for when we
*do* have a different platform ABI - 1860. By Chris Halse Rogers
-
Merge prereq
- 1861. By Chris Halse Rogers
-
Merge prereq
- 1862. By Chris Halse Rogers
-
Merged versioned-loader into private-
library- loading. - 1863. By Chris Halse Rogers
-
Merged versioned-loader into private-
library- loading. - 1864. By Chris Halse Rogers
-
Use a dummy library rather than something that might actually have side-effects
- 1865. By Chris Halse Rogers
-
Merged versioned-loader into private-
library- loading. - 1866. By Chris Halse Rogers
-
Timeouts for everyone!
This was reliably timing out for me under valgrind. 50 seconds should be enough for everyone!
- 1867. By Chris Halse Rogers
-
Merge trunk. Conflicts!
- 1868. By Chris Halse Rogers
-
Fix cross-building of client-
platform- dummy - 1869. By Chris Halse Rogers
-
Aww, yeah. Don't load libmirplatform twice
- 1870. By Chris Halse Rogers
-
Merge trunk, reverting version-drivers branch as this subsumes it
- 1871. By Chris Halse Rogers
-
Merge trunk, resolving conflicts
- 1872. By Chris Halse Rogers
-
Merge trunk
- 1873. By Chris Halse Rogers
-
Merge trunk
- 1874. By Chris Halse Rogers
-
Drop numbering from driver packages.
Looking through what's involved in that ABI, we haven't changed anything in there for a while.
We should be able to handle not breaking the driver interface, and when we do we should
be able to invest the effort to handle backwards compatibility. - 1875. By Chris Halse Rogers
-
Use MIR_CLIENT_
PLATFORM_ 2. We load the platform libraries from an entirely new path, so it's not actually
necessary for the purposes of disambiguation, but it's also harmless. - 1876. By Chris Halse Rogers
-
Install and load platform libraries in unadorned path.
- 1877. By Chris Halse Rogers
-
Merge trunk
- 1878. By Chris Halse Rogers
-
Drop duplicated prefixes from platform libraries
- 1879. By Chris Halse Rogers
-
Merge trunk
- 1880. By Chris Halse Rogers
-
Remove resolved hw_get_module question-comment
- 1881. By Chris Halse Rogers
-
Remove spurious whitespace changes
- 1882. By Chris Halse Rogers
-
Use BOOST_THROW_
EXCEPTION to decorate the exceptions - 1883. By Chris Halse Rogers
-
Clarify MIR_GRAPHICS_
PLATFORM_ 1 CMake comment - 1884. By Chris Halse Rogers
-
Fix android platform module install
- 1885. By Chris Halse Rogers
-
Merge trunk
- 1886. By Chris Halse Rogers
-
Fix android graphics platform linking post-merge
- 1887. By Chris Halse Rogers
-
Link Mesa platform graphics module against libmirplatform, to pick up symbol versions
- 1888. By Chris Halse Rogers
-
Move client and server modules into an appropriate directory in the build tree
- 1889. By Chris Halse Rogers
-
Fix remaining Android module load failure in tests
- 1890. By Chris Halse Rogers
-
Merge trunk
- 1891. By Chris Halse Rogers
-
Turn libplatformstub into platform-
graphics- dummy.so and fix the tests - 1892. By Chris Halse Rogers
-
Add a set of helpers to find the various platform plugins
- 1893. By Chris Halse Rogers
-
Don't throw exception pointers; just throw the exception.
- 1894. By Chris Halse Rogers
-
Fix name for platform-
graphics- dummy.so - 1895. By Chris Halse Rogers
-
Coalesce all hardcoded platform module strings into {client,
server} _platform_ () calls - 1896. By Chris Halse Rogers
-
Rename, and install client & server stub platforms into mir-test-tools
- 1897. By Chris Halse Rogers
-
Merge trunk, updating the RendererFactory cludge for graphics-stub.so
- 1898. By Chris Halse Rogers
-
Fix random tab character
- 1899. By Chris Halse Rogers
-
Fix stub server platform build on armhf
- 1900. By Chris Halse Rogers
-
Fix unnecessary symbol leakage from server platform modules
- 1901. By Chris Halse Rogers
-
Merge trunk
Unmerged revisions
- 1901. By Chris Halse Rogers
-
Merge trunk
- 1900. By Chris Halse Rogers
-
Fix unnecessary symbol leakage from server platform modules
- 1899. By Chris Halse Rogers
-
Fix stub server platform build on armhf
- 1898. By Chris Halse Rogers
-
Fix random tab character
- 1897. By Chris Halse Rogers
-
Merge trunk, updating the RendererFactory cludge for graphics-stub.so
- 1896. By Chris Halse Rogers
-
Rename, and install client & server stub platforms into mir-test-tools
- 1895. By Chris Halse Rogers
-
Coalesce all hardcoded platform module strings into {client,
server} _platform_ () calls - 1894. By Chris Halse Rogers
-
Fix name for platform-
graphics- dummy.so - 1893. By Chris Halse Rogers
-
Don't throw exception pointers; just throw the exception.
- 1892. By Chris Halse Rogers
-
Add a set of helpers to find the various platform plugins
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'CMakeLists.txt' | |||
| 2 | --- CMakeLists.txt 2014-08-21 13:18:01 +0000 | |||
| 3 | +++ CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 4 | @@ -107,7 +107,7 @@ | |||
| 5 | 107 | include_directories(include/shared) | 107 | include_directories(include/shared) |
| 6 | 108 | 108 | ||
| 7 | 109 | # Check for boost | 109 | # Check for boost |
| 9 | 110 | find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams REQUIRED) | 110 | find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams filesystem REQUIRED) |
| 10 | 111 | include_directories ( | 111 | include_directories ( |
| 11 | 112 | ${Boost_INCLUDE_DIRS} | 112 | ${Boost_INCLUDE_DIRS} |
| 12 | 113 | ) | 113 | ) |
| 13 | @@ -159,13 +159,15 @@ | |||
| 14 | 159 | include_directories (${EGL_INCLUDE_DIRS}) | 159 | include_directories (${EGL_INCLUDE_DIRS}) |
| 15 | 160 | include_directories (${GLM_INCLUDE_DIRS}) | 160 | include_directories (${GLM_INCLUDE_DIRS}) |
| 16 | 161 | 161 | ||
| 17 | 162 | find_package( PkgConfig ) | ||
| 18 | 163 | |||
| 19 | 162 | if (MIR_BUILD_PLATFORM_ANDROID) | 164 | if (MIR_BUILD_PLATFORM_ANDROID) |
| 20 | 163 | find_package(AndroidProperties REQUIRED) | 165 | find_package(AndroidProperties REQUIRED) |
| 21 | 164 | find_package(LibHardware REQUIRED) | 166 | find_package(LibHardware REQUIRED) |
| 22 | 167 | pkg_check_modules( ANDROID_HEADERS REQUIRED android-headers ) | ||
| 23 | 165 | endif() | 168 | endif() |
| 24 | 166 | 169 | ||
| 25 | 167 | if (MIR_BUILD_PLATFORM_MESA) | 170 | if (MIR_BUILD_PLATFORM_MESA) |
| 26 | 168 | find_package( PkgConfig ) | ||
| 27 | 169 | pkg_check_modules( GBM REQUIRED gbm>=9.0.0) | 171 | pkg_check_modules( GBM REQUIRED gbm>=9.0.0) |
| 28 | 170 | pkg_check_modules( DRM REQUIRED libdrm ) | 172 | pkg_check_modules( DRM REQUIRED libdrm ) |
| 29 | 171 | endif() | 173 | endif() |
| 30 | 172 | 174 | ||
| 31 | === modified file 'client-ABI-sha1sums' | |||
| 32 | --- client-ABI-sha1sums 2014-08-04 16:01:56 +0000 | |||
| 33 | +++ client-ABI-sha1sums 2014-08-29 01:18:58 +0000 | |||
| 34 | @@ -12,5 +12,5 @@ | |||
| 35 | 12 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h | 12 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h |
| 36 | 13 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h | 13 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h |
| 37 | 14 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h | 14 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h |
| 39 | 15 | 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/shared/mir_toolkit/mesa/native_display.h | 15 | 4975998aa1056ed0d39dcc538127453e516ad8e9 include/shared/mir_toolkit/mesa/native_display.h |
| 40 | 16 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h | 16 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h |
| 41 | 17 | 17 | ||
| 42 | === modified file 'common-ABI-sha1sums' | |||
| 43 | --- common-ABI-sha1sums 2014-08-26 16:23:10 +0000 | |||
| 44 | +++ common-ABI-sha1sums 2014-08-29 01:18:58 +0000 | |||
| 45 | @@ -28,18 +28,22 @@ | |||
| 46 | 28 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h | 28 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h |
| 47 | 29 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h | 29 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h |
| 48 | 30 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h | 30 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h |
| 49 | 31 | 2697f3edce3b3120983b402d383bbdead10f5487 include/shared/mir/logging/null_shared_library_prober_report.h | ||
| 50 | 32 | e9e5f22fe9deb8965946be0f85ea3d255baca740 include/shared/mir/logging/shared_library_prober_report.h | ||
| 51 | 31 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h | 33 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h |
| 52 | 32 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h | 34 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h |
| 53 | 33 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h | 35 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h |
| 54 | 34 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h | 36 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h |
| 55 | 35 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h | 37 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h |
| 56 | 36 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h | 38 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h |
| 57 | 39 | 4d80544bf59ef452979b934d664ac592aff58c82 include/shared/mir/shared_library_prober.h | ||
| 58 | 40 | 53e4159f2a0b564cb39a7785b4e229f6f7424779 include/shared/mir/shared_library_prober_report.h | ||
| 59 | 37 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h | 41 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h |
| 60 | 38 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h | 42 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h |
| 61 | 39 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h | 43 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h |
| 62 | 40 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h | 44 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h |
| 63 | 41 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h | 45 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h |
| 65 | 42 | 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/shared/mir_toolkit/mesa/native_display.h | 46 | 4975998aa1056ed0d39dcc538127453e516ad8e9 include/shared/mir_toolkit/mesa/native_display.h |
| 66 | 43 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h | 47 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h |
| 67 | 44 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h | 48 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h |
| 68 | 45 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h | 49 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h |
| 69 | 46 | 50 | ||
| 70 | === modified file 'debian/control' | |||
| 71 | --- debian/control 2014-08-26 09:27:49 +0000 | |||
| 72 | +++ debian/control 2014-08-29 01:18:58 +0000 | |||
| 73 | @@ -19,6 +19,7 @@ | |||
| 74 | 19 | libboost-program-options-dev, | 19 | libboost-program-options-dev, |
| 75 | 20 | libboost-system-dev, | 20 | libboost-system-dev, |
| 76 | 21 | libboost-iostreams-dev, | 21 | libboost-iostreams-dev, |
| 77 | 22 | libboost-filesystem-dev, | ||
| 78 | 22 | protobuf-compiler, | 23 | protobuf-compiler, |
| 79 | 23 | libdrm-dev, | 24 | libdrm-dev, |
| 80 | 24 | libegl1-mesa-dev, | 25 | libegl1-mesa-dev, |
| 81 | @@ -51,8 +52,7 @@ | |||
| 82 | 51 | Pre-Depends: ${misc:Pre-Depends} | 52 | Pre-Depends: ${misc:Pre-Depends} |
| 83 | 52 | Depends: ${misc:Depends}, | 53 | Depends: ${misc:Depends}, |
| 84 | 53 | ${shlibs:Depends}, | 54 | ${shlibs:Depends}, |
| 87 | 54 | libmirplatformgraphics-mesa (= ${binary:Version}) | | 55 | mir-platform-graphics-mesa-1 | mir-platform-graphics-android-1, |
| 86 | 55 | libmirplatformgraphics-android (= ${binary:Version}), | ||
| 88 | 56 | Description: Display server for Ubuntu - server library | 56 | Description: Display server for Ubuntu - server library |
| 89 | 57 | Mir is a display server running on linux systems, with a focus on efficiency, | 57 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 90 | 58 | robust operation and a well-defined driver model. | 58 | robust operation and a well-defined driver model. |
| 91 | @@ -73,14 +73,13 @@ | |||
| 92 | 73 | Contains the shared libraries required for the Mir server to interact with | 73 | Contains the shared libraries required for the Mir server to interact with |
| 93 | 74 | the underlying hardware platform. | 74 | the underlying hardware platform. |
| 94 | 75 | 75 | ||
| 96 | 76 | Package: libmirplatformgraphics-mesa | 76 | Package: mir-platform-graphics-mesa-1 |
| 97 | 77 | Section: libs | 77 | Section: libs |
| 98 | 78 | Architecture: i386 amd64 armhf arm64 | 78 | Architecture: i386 amd64 armhf arm64 |
| 99 | 79 | Multi-Arch: same | 79 | Multi-Arch: same |
| 100 | 80 | Pre-Depends: ${misc:Pre-Depends} | 80 | Pre-Depends: ${misc:Pre-Depends} |
| 101 | 81 | Depends: ${misc:Depends}, | 81 | Depends: ${misc:Depends}, |
| 102 | 82 | ${shlibs:Depends}, | 82 | ${shlibs:Depends}, |
| 103 | 83 | libmirplatform2 (= ${binary:Version}), | ||
| 104 | 84 | Description: Display server for Ubuntu - platform library for Mesa | 83 | Description: Display server for Ubuntu - platform library for Mesa |
| 105 | 85 | Mir is a display server running on linux systems, with a focus on efficiency, | 84 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 106 | 86 | robust operation and a well-defined driver model. | 85 | robust operation and a well-defined driver model. |
| 107 | @@ -88,14 +87,13 @@ | |||
| 108 | 88 | Contains the shared libraries required for the Mir server to interact with | 87 | Contains the shared libraries required for the Mir server to interact with |
| 109 | 89 | the hardware platform using the Mesa drivers. | 88 | the hardware platform using the Mesa drivers. |
| 110 | 90 | 89 | ||
| 112 | 91 | Package: libmirplatformgraphics-android | 90 | Package: mir-platform-graphics-android-1 |
| 113 | 92 | Section: libs | 91 | Section: libs |
| 114 | 93 | Architecture: i386 amd64 armhf | 92 | Architecture: i386 amd64 armhf |
| 115 | 94 | Multi-Arch: same | 93 | Multi-Arch: same |
| 116 | 95 | Pre-Depends: ${misc:Pre-Depends} | 94 | Pre-Depends: ${misc:Pre-Depends} |
| 117 | 96 | Depends: ${misc:Depends}, | 95 | Depends: ${misc:Depends}, |
| 118 | 97 | ${shlibs:Depends}, | 96 | ${shlibs:Depends}, |
| 119 | 98 | libmirplatform2 (= ${binary:Version}), | ||
| 120 | 99 | Description: Display server for Ubuntu - platform library for Android | 97 | Description: Display server for Ubuntu - platform library for Android |
| 121 | 100 | Mir is a display server running on linux systems, with a focus on efficiency, | 98 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 122 | 101 | robust operation and a well-defined driver model. | 99 | robust operation and a well-defined driver model. |
| 123 | @@ -159,8 +157,7 @@ | |||
| 124 | 159 | Pre-Depends: ${misc:Pre-Depends} | 157 | Pre-Depends: ${misc:Pre-Depends} |
| 125 | 160 | Depends: ${misc:Depends}, | 158 | Depends: ${misc:Depends}, |
| 126 | 161 | ${shlibs:Depends}, | 159 | ${shlibs:Depends}, |
| 129 | 162 | libmirclientplatform-mesa (= ${binary:Version}) | | 160 | mir-client-platform-mesa-1 | mir-client-platform-android-1, |
| 128 | 163 | libmirclientplatform-android (= ${binary:Version}), | ||
| 130 | 164 | Description: Display server for Ubuntu - client library | 161 | Description: Display server for Ubuntu - client library |
| 131 | 165 | Mir is a display server running on linux systems, with a focus on efficiency, | 162 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 132 | 166 | robust operation and a well-defined driver model. | 163 | robust operation and a well-defined driver model. |
| 133 | @@ -182,14 +179,13 @@ | |||
| 134 | 182 | . | 179 | . |
| 135 | 183 | Contains header files required to develop against Mir. | 180 | Contains header files required to develop against Mir. |
| 136 | 184 | 181 | ||
| 138 | 185 | Package: libmirclientplatform-mesa | 182 | Package: mir-client-platform-mesa-1 |
| 139 | 186 | Section: libs | 183 | Section: libs |
| 140 | 187 | Architecture: i386 amd64 armhf arm64 | 184 | Architecture: i386 amd64 armhf arm64 |
| 141 | 188 | Multi-Arch: same | 185 | Multi-Arch: same |
| 142 | 189 | Pre-Depends: ${misc:Pre-Depends} | 186 | Pre-Depends: ${misc:Pre-Depends} |
| 143 | 190 | Depends: ${misc:Depends}, | 187 | Depends: ${misc:Depends}, |
| 144 | 191 | ${shlibs:Depends} | 188 | ${shlibs:Depends} |
| 145 | 192 | Replaces: libmirclientplatform | ||
| 146 | 193 | Description: Display server for Ubuntu - client platform library for Mesa | 189 | Description: Display server for Ubuntu - client platform library for Mesa |
| 147 | 194 | Mir is a display server running on linux systems, with a focus on efficiency, | 190 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 148 | 195 | robust operation and a well-defined driver model. | 191 | robust operation and a well-defined driver model. |
| 149 | @@ -197,14 +193,13 @@ | |||
| 150 | 197 | Contains the shared libraries required for the Mir clients to interact with | 193 | Contains the shared libraries required for the Mir clients to interact with |
| 151 | 198 | the underlying hardware platform using the Mesa drivers. | 194 | the underlying hardware platform using the Mesa drivers. |
| 152 | 199 | 195 | ||
| 154 | 200 | Package: libmirclientplatform-android | 196 | Package: mir-client-platform-android-1 |
| 155 | 201 | Section: libs | 197 | Section: libs |
| 156 | 202 | Architecture: i386 amd64 armhf | 198 | Architecture: i386 amd64 armhf |
| 157 | 203 | Multi-Arch: same | 199 | Multi-Arch: same |
| 158 | 204 | Pre-Depends: ${misc:Pre-Depends} | 200 | Pre-Depends: ${misc:Pre-Depends} |
| 159 | 205 | Depends: ${misc:Depends}, | 201 | Depends: ${misc:Depends}, |
| 160 | 206 | ${shlibs:Depends} | 202 | ${shlibs:Depends} |
| 161 | 207 | Replaces: libmirclientplatform | ||
| 162 | 208 | Description: Display server for Ubuntu - client platform library for Android | 203 | Description: Display server for Ubuntu - client platform library for Android |
| 163 | 209 | Mir is a display server running on linux systems, with a focus on efficiency, | 204 | Mir is a display server running on linux systems, with a focus on efficiency, |
| 164 | 210 | robust operation and a well-defined driver model. | 205 | robust operation and a well-defined driver model. |
| 165 | 211 | 206 | ||
| 166 | === removed file 'debian/create_postinst_prerm_scripts.sh' | |||
| 167 | --- debian/create_postinst_prerm_scripts.sh 2014-04-15 15:02:05 +0000 | |||
| 168 | +++ debian/create_postinst_prerm_scripts.sh 1970-01-01 00:00:00 +0000 | |||
| 169 | @@ -1,39 +0,0 @@ | |||
| 170 | 1 | #!/bin/sh | ||
| 171 | 2 | |||
| 172 | 3 | set -e | ||
| 173 | 4 | |||
| 174 | 5 | dpkg_alternatives_priority=500 | ||
| 175 | 6 | deb_host_arch=$1 | ||
| 176 | 7 | deb_host_multiarch=$2 | ||
| 177 | 8 | |||
| 178 | 9 | mir_platform_types="platformgraphics clientplatform" | ||
| 179 | 10 | case $deb_host_arch in | ||
| 180 | 11 | arm64) | ||
| 181 | 12 | mir_platforms="mesa" | ||
| 182 | 13 | ;; | ||
| 183 | 14 | *) | ||
| 184 | 15 | mir_platforms="android mesa" | ||
| 185 | 16 | ;; | ||
| 186 | 17 | esac | ||
| 187 | 18 | |||
| 188 | 19 | create_script() | ||
| 189 | 20 | { | ||
| 190 | 21 | local script=$1 | ||
| 191 | 22 | local platform_type=$2 | ||
| 192 | 23 | local platform=$3 | ||
| 193 | 24 | |||
| 194 | 25 | sed -e "s/@DEB_HOST_MULTIARCH@/$deb_host_multiarch/" \ | ||
| 195 | 26 | -e "s/@MIR_PLATFORM_TYPE@/$platform_type/" \ | ||
| 196 | 27 | -e "s/@MIR_PLATFORM@/$platform/" \ | ||
| 197 | 28 | -e "s/@DPKG_ALTERNATIVES_PRIORITY@/$dpkg_alternatives_priority/" \ | ||
| 198 | 29 | debian/update-alternatives.${script}.in > debian/libmir$platform_type-$platform.${script} | ||
| 199 | 30 | } | ||
| 200 | 31 | |||
| 201 | 32 | for platform_type in $mir_platform_types; | ||
| 202 | 33 | do | ||
| 203 | 34 | for platform in $mir_platforms; | ||
| 204 | 35 | do | ||
| 205 | 36 | create_script postinst $platform_type $platform | ||
| 206 | 37 | create_script prerm $platform_type $platform | ||
| 207 | 38 | done | ||
| 208 | 39 | done | ||
| 209 | 40 | 0 | ||
| 210 | === removed file 'debian/install_ld_so_conf.sh' | |||
| 211 | --- debian/install_ld_so_conf.sh 2014-04-15 15:02:05 +0000 | |||
| 212 | +++ debian/install_ld_so_conf.sh 1970-01-01 00:00:00 +0000 | |||
| 213 | @@ -1,26 +0,0 @@ | |||
| 214 | 1 | #!/bin/sh | ||
| 215 | 2 | |||
| 216 | 3 | set -e | ||
| 217 | 4 | |||
| 218 | 5 | DEB_HOST_ARCH=$1 | ||
| 219 | 6 | DEB_HOST_MULTIARCH=$2 | ||
| 220 | 7 | |||
| 221 | 8 | mir_platform_types="platformgraphics clientplatform" | ||
| 222 | 9 | case $DEB_HOST_ARCH in | ||
| 223 | 10 | arm64) | ||
| 224 | 11 | mir_platforms="mesa" | ||
| 225 | 12 | ;; | ||
| 226 | 13 | *) | ||
| 227 | 14 | mir_platforms="android mesa" | ||
| 228 | 15 | ;; | ||
| 229 | 16 | esac | ||
| 230 | 17 | |||
| 231 | 18 | for platform_type in $mir_platform_types; | ||
| 232 | 19 | do | ||
| 233 | 20 | for platform in $mir_platforms; | ||
| 234 | 21 | do | ||
| 235 | 22 | platform_dir="/usr/lib/$DEB_HOST_MULTIARCH/mir/$platform_type/$platform" | ||
| 236 | 23 | package_dir="debian/libmir$platform_type-$platform/$platform_dir" | ||
| 237 | 24 | echo "$platform_dir" > $package_dir/ld.so.conf | ||
| 238 | 25 | done | ||
| 239 | 26 | done | ||
| 240 | 27 | 0 | ||
| 241 | === renamed file 'debian/libmirclientplatform-android.install' => 'debian/mir-client-platform-android-1.install' | |||
| 242 | --- debian/libmirclientplatform-android.install 2014-02-14 08:43:47 +0000 | |||
| 243 | +++ debian/mir-client-platform-android-1.install 2014-08-29 01:18:58 +0000 | |||
| 244 | @@ -1,1 +1,1 @@ | |||
| 246 | 1 | usr/lib/*/mir/clientplatform/android/* | 1 | usr/lib/*/mir/client-platform-1/client-platform-android.so |
| 247 | 2 | 2 | ||
| 248 | === renamed file 'debian/libmirclientplatform-mesa.install' => 'debian/mir-client-platform-mesa-1.install' | |||
| 249 | --- debian/libmirclientplatform-mesa.install 2014-02-14 08:43:47 +0000 | |||
| 250 | +++ debian/mir-client-platform-mesa-1.install 2014-08-29 01:18:58 +0000 | |||
| 251 | @@ -1,1 +1,1 @@ | |||
| 253 | 1 | usr/lib/*/mir/clientplatform/mesa/* | 1 | usr/lib/*/mir/client-platform-1/client-platform-mesa.so |
| 254 | 2 | 2 | ||
| 255 | === renamed file 'debian/libmirplatformgraphics-android.install' => 'debian/mir-platform-graphics-android-1.install' | |||
| 256 | --- debian/libmirplatformgraphics-android.install 2014-02-14 08:43:47 +0000 | |||
| 257 | +++ debian/mir-platform-graphics-android-1.install 2014-08-29 01:18:58 +0000 | |||
| 258 | @@ -1,1 +1,1 @@ | |||
| 260 | 1 | usr/lib/*/mir/platformgraphics/android/* | 1 | usr/lib/*/mir/server-platform-1/platform-graphics-android.so |
| 261 | 2 | 2 | ||
| 262 | === renamed file 'debian/libmirplatformgraphics-mesa.install' => 'debian/mir-platform-graphics-mesa-1.install' | |||
| 263 | --- debian/libmirplatformgraphics-mesa.install 2014-02-14 08:43:47 +0000 | |||
| 264 | +++ debian/mir-platform-graphics-mesa-1.install 2014-08-29 01:18:58 +0000 | |||
| 265 | @@ -1,1 +1,1 @@ | |||
| 267 | 1 | usr/lib/*/mir/platformgraphics/mesa/* | 1 | usr/lib/*/mir/server-platform-1/platform-graphics-mesa.so |
| 268 | 2 | 2 | ||
| 269 | === modified file 'debian/rules' | |||
| 270 | --- debian/rules 2014-08-15 08:04:46 +0000 | |||
| 271 | +++ debian/rules 2014-08-29 01:18:58 +0000 | |||
| 272 | @@ -46,14 +46,3 @@ | |||
| 273 | 46 | # TODO: we'll use a symbol file once mir is abi stable | 46 | # TODO: we'll use a symbol file once mir is abi stable |
| 274 | 47 | override_dh_makeshlibs: | 47 | override_dh_makeshlibs: |
| 275 | 48 | dh_makeshlibs -V | 48 | dh_makeshlibs -V |
| 276 | 49 | |||
| 277 | 50 | override_dh_install: | ||
| 278 | 51 | dh_install --fail-missing \ | ||
| 279 | 52 | -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirplatformgraphics.so \ | ||
| 280 | 53 | -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirclientplatform.so | ||
| 281 | 54 | sh debian/install_ld_so_conf.sh $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH) | ||
| 282 | 55 | |||
| 283 | 56 | override_dh_installdeb: | ||
| 284 | 57 | sh debian/create_postinst_prerm_scripts.sh \ | ||
| 285 | 58 | $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH) | ||
| 286 | 59 | dh_installdeb | ||
| 287 | 60 | 49 | ||
| 288 | === removed file 'debian/update-alternatives.postinst.in' | |||
| 289 | --- debian/update-alternatives.postinst.in 2014-02-14 09:20:28 +0000 | |||
| 290 | +++ debian/update-alternatives.postinst.in 1970-01-01 00:00:00 +0000 | |||
| 291 | @@ -1,18 +0,0 @@ | |||
| 292 | 1 | #!/bin/sh | ||
| 293 | 2 | |||
| 294 | 3 | set -e | ||
| 295 | 4 | |||
| 296 | 5 | if [ "$1" = "configure" ]; | ||
| 297 | 6 | then | ||
| 298 | 7 | update-alternatives --force --install \ | ||
| 299 | 8 | /etc/ld.so.conf.d/@DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@.conf \ | ||
| 300 | 9 | @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \ | ||
| 301 | 10 | /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf \ | ||
| 302 | 11 | @DPKG_ALTERNATIVES_PRIORITY@ | ||
| 303 | 12 | |||
| 304 | 13 | LDCONFIG_NOTRIGGER=y ldconfig | ||
| 305 | 14 | fi | ||
| 306 | 15 | |||
| 307 | 16 | #DEBHELPER# | ||
| 308 | 17 | |||
| 309 | 18 | exit 0 | ||
| 310 | 19 | 0 | ||
| 311 | === removed file 'debian/update-alternatives.prerm.in' | |||
| 312 | --- debian/update-alternatives.prerm.in 2014-02-14 09:20:28 +0000 | |||
| 313 | +++ debian/update-alternatives.prerm.in 1970-01-01 00:00:00 +0000 | |||
| 314 | @@ -1,16 +0,0 @@ | |||
| 315 | 1 | #!/bin/sh | ||
| 316 | 2 | |||
| 317 | 3 | set -e | ||
| 318 | 4 | |||
| 319 | 5 | if [ "$1" = "remove" ]; | ||
| 320 | 6 | then | ||
| 321 | 7 | update-alternatives --remove \ | ||
| 322 | 8 | @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \ | ||
| 323 | 9 | /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf | ||
| 324 | 10 | |||
| 325 | 11 | ldconfig | ||
| 326 | 12 | fi | ||
| 327 | 13 | |||
| 328 | 14 | #DEBHELPER# | ||
| 329 | 15 | |||
| 330 | 16 | exit 0 | ||
| 331 | 17 | 0 | ||
| 332 | === modified file 'include/platform/mir/graphics/platform.h' | |||
| 333 | --- include/platform/mir/graphics/platform.h 2014-07-02 06:29:24 +0000 | |||
| 334 | +++ include/platform/mir/graphics/platform.h 2014-08-29 01:18:58 +0000 | |||
| 335 | @@ -126,6 +126,33 @@ | |||
| 336 | 126 | }; | 126 | }; |
| 337 | 127 | 127 | ||
| 338 | 128 | /** | 128 | /** |
| 339 | 129 | * A measure of how good this module is at supporting the current device | ||
| 340 | 130 | * | ||
| 341 | 131 | * \note This is compared as an integer; best + 1 is a valid PlatformPriority that | ||
| 342 | 132 | * will be used in preference to a module that reports best. | ||
| 343 | 133 | * Platform modules distributed with Mir will never use a priority higher | ||
| 344 | 134 | * than best. | ||
| 345 | 135 | */ | ||
| 346 | 136 | enum PlatformPriority : uint32_t | ||
| 347 | 137 | { | ||
| 348 | 138 | unsupported = 0, /**< Unable to function at all on this device */ | ||
| 349 | 139 | supported = 128, /**< Capable of providing a functioning Platform on this device, | ||
| 350 | 140 | * possibly with degraded performance or features. | ||
| 351 | 141 | */ | ||
| 352 | 142 | best = 256 /**< Capable of providing a Platform with the best features and | ||
| 353 | 143 | * performance this device is capable of. | ||
| 354 | 144 | */ | ||
| 355 | 145 | }; | ||
| 356 | 146 | |||
| 357 | 147 | /** | ||
| 358 | 148 | * Describes a platform module | ||
| 359 | 149 | */ | ||
| 360 | 150 | struct ModuleProperties | ||
| 361 | 151 | { | ||
| 362 | 152 | char const* name; | ||
| 363 | 153 | }; | ||
| 364 | 154 | |||
| 365 | 155 | /** | ||
| 366 | 129 | * Function prototype used to return a new graphics platform. | 156 | * Function prototype used to return a new graphics platform. |
| 367 | 130 | * | 157 | * |
| 368 | 131 | * \param [in] options options to use for this platform | 158 | * \param [in] options options to use for this platform |
| 369 | @@ -148,6 +175,15 @@ | |||
| 370 | 148 | boost::program_options::options_description& config); | 175 | boost::program_options::options_description& config); |
| 371 | 149 | extern "C" void add_platform_options( | 176 | extern "C" void add_platform_options( |
| 372 | 150 | boost::program_options::options_description& config); | 177 | boost::program_options::options_description& config); |
| 373 | 178 | |||
| 374 | 179 | // TODO: We actually need to be more granular here; on a device with more | ||
| 375 | 180 | // than one graphics system we may need a different platform per GPU, | ||
| 376 | 181 | // so we should be associating platforms with graphics devices in some way | ||
| 377 | 182 | extern "C" typedef PlatformPriority(*PlatformProbe)(); | ||
| 378 | 183 | extern "C" PlatformPriority probe_platform(); | ||
| 379 | 184 | |||
| 380 | 185 | extern "C" typedef ModuleProperties const*(*DescribeModule)(); | ||
| 381 | 186 | extern "C" ModuleProperties const* describe_module(); | ||
| 382 | 151 | } | 187 | } |
| 383 | 152 | } | 188 | } |
| 384 | 153 | 189 | ||
| 385 | 154 | 190 | ||
| 386 | === modified file 'include/platform/mir/options/configuration.h' | |||
| 387 | --- include/platform/mir/options/configuration.h 2014-08-05 14:19:29 +0000 | |||
| 388 | +++ include/platform/mir/options/configuration.h 2014-08-29 01:18:58 +0000 | |||
| 389 | @@ -39,6 +39,7 @@ | |||
| 390 | 39 | extern char const* const connector_report_opt; | 39 | extern char const* const connector_report_opt; |
| 391 | 40 | extern char const* const scene_report_opt; | 40 | extern char const* const scene_report_opt; |
| 392 | 41 | extern char const* const input_report_opt; | 41 | extern char const* const input_report_opt; |
| 393 | 42 | extern char const* const shared_library_prober_report_opt; | ||
| 394 | 42 | extern char const* const host_socket_opt; | 43 | extern char const* const host_socket_opt; |
| 395 | 43 | extern char const* const frontend_threads_opt; | 44 | extern char const* const frontend_threads_opt; |
| 396 | 44 | extern char const* const fatal_abort_opt; | 45 | extern char const* const fatal_abort_opt; |
| 397 | @@ -56,6 +57,7 @@ | |||
| 398 | 56 | extern char const* const lttng_opt_value; | 57 | extern char const* const lttng_opt_value; |
| 399 | 57 | 58 | ||
| 400 | 58 | extern char const* const platform_graphics_lib; | 59 | extern char const* const platform_graphics_lib; |
| 401 | 60 | extern char const* const platform_graphics_path; | ||
| 402 | 59 | 61 | ||
| 403 | 60 | class Configuration | 62 | class Configuration |
| 404 | 61 | { | 63 | { |
| 405 | 62 | 64 | ||
| 406 | === removed file 'include/platform/mir/shared_library_loader.h' | |||
| 407 | --- include/platform/mir/shared_library_loader.h 2014-03-19 17:57:45 +0000 | |||
| 408 | +++ include/platform/mir/shared_library_loader.h 1970-01-01 00:00:00 +0000 | |||
| 409 | @@ -1,28 +0,0 @@ | |||
| 410 | 1 | /* | ||
| 411 | 2 | * Copyright © 2013 Canonical Ltd. | ||
| 412 | 3 | * | ||
| 413 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 414 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 415 | 6 | * as published by the Free Software Foundation. | ||
| 416 | 7 | * | ||
| 417 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 418 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 419 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 420 | 11 | * GNU Lesser General Public License for more details. | ||
| 421 | 12 | * | ||
| 422 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 423 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 424 | 15 | * | ||
| 425 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | ||
| 426 | 17 | */ | ||
| 427 | 18 | |||
| 428 | 19 | #ifndef MIR_SHARED_LIBRARY_LOADER_H_ | ||
| 429 | 20 | #define MIR_SHARED_LIBRARY_LOADER_H_ | ||
| 430 | 21 | |||
| 431 | 22 | #include <string> | ||
| 432 | 23 | namespace mir | ||
| 433 | 24 | { | ||
| 434 | 25 | class SharedLibrary; | ||
| 435 | 26 | SharedLibrary const* load_library(std::string const& libname); | ||
| 436 | 27 | } | ||
| 437 | 28 | #endif | ||
| 438 | 29 | 0 | ||
| 439 | === modified file 'include/server/mir/default_server_configuration.h' | |||
| 440 | --- include/server/mir/default_server_configuration.h 2014-08-07 10:27:18 +0000 | |||
| 441 | +++ include/server/mir/default_server_configuration.h 2014-08-29 01:18:58 +0000 | |||
| 442 | @@ -35,6 +35,7 @@ | |||
| 443 | 35 | namespace mir | 35 | namespace mir |
| 444 | 36 | { | 36 | { |
| 445 | 37 | class ServerActionQueue; | 37 | class ServerActionQueue; |
| 446 | 38 | class SharedLibraryProberReport; | ||
| 447 | 38 | 39 | ||
| 448 | 39 | namespace compositor | 40 | namespace compositor |
| 449 | 40 | { | 41 | { |
| 450 | @@ -307,6 +308,7 @@ | |||
| 451 | 307 | 308 | ||
| 452 | 308 | virtual std::shared_ptr<time::Clock> the_clock(); | 309 | virtual std::shared_ptr<time::Clock> the_clock(); |
| 453 | 309 | virtual std::shared_ptr<ServerActionQueue> the_server_action_queue(); | 310 | virtual std::shared_ptr<ServerActionQueue> the_server_action_queue(); |
| 454 | 311 | virtual std::shared_ptr<SharedLibraryProberReport> the_shared_library_prober_report(); | ||
| 455 | 310 | 312 | ||
| 456 | 311 | protected: | 313 | protected: |
| 457 | 312 | std::shared_ptr<options::Option> the_options() const; | 314 | std::shared_ptr<options::Option> the_options() const; |
| 458 | @@ -407,6 +409,7 @@ | |||
| 459 | 407 | CachedPtr<scene::SessionCoordinator> session_coordinator; | 409 | CachedPtr<scene::SessionCoordinator> session_coordinator; |
| 460 | 408 | CachedPtr<EmergencyCleanup> emergency_cleanup; | 410 | CachedPtr<EmergencyCleanup> emergency_cleanup; |
| 461 | 409 | CachedPtr<shell::HostLifecycleEventListener> host_lifecycle_event_listener; | 411 | CachedPtr<shell::HostLifecycleEventListener> host_lifecycle_event_listener; |
| 462 | 412 | CachedPtr<SharedLibraryProberReport> shared_library_prober_report; | ||
| 463 | 410 | 413 | ||
| 464 | 411 | private: | 414 | private: |
| 465 | 412 | std::shared_ptr<options::Configuration> const configuration_options; | 415 | std::shared_ptr<options::Configuration> const configuration_options; |
| 466 | 413 | 416 | ||
| 467 | === added file 'include/shared/mir/logging/null_shared_library_prober_report.h' | |||
| 468 | --- include/shared/mir/logging/null_shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 469 | +++ include/shared/mir/logging/null_shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 470 | @@ -0,0 +1,49 @@ | |||
| 471 | 1 | /* | ||
| 472 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 473 | 3 | * | ||
| 474 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 475 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 476 | 6 | * published by the Free Software Foundation. | ||
| 477 | 7 | * | ||
| 478 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 479 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 480 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 481 | 11 | * GNU Lesser General Public License for more details. | ||
| 482 | 12 | * | ||
| 483 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 484 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 485 | 15 | * | ||
| 486 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 487 | 17 | */ | ||
| 488 | 18 | |||
| 489 | 19 | #ifndef MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 490 | 20 | #define MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 491 | 21 | |||
| 492 | 22 | #include "mir/shared_library_prober_report.h" | ||
| 493 | 23 | |||
| 494 | 24 | namespace mir | ||
| 495 | 25 | { | ||
| 496 | 26 | namespace logging | ||
| 497 | 27 | { | ||
| 498 | 28 | |||
| 499 | 29 | class NullSharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 500 | 30 | { | ||
| 501 | 31 | public: | ||
| 502 | 32 | void probing_path(boost::filesystem::path const& /*path*/) override | ||
| 503 | 33 | { | ||
| 504 | 34 | } | ||
| 505 | 35 | void probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) override | ||
| 506 | 36 | { | ||
| 507 | 37 | } | ||
| 508 | 38 | void loading_library(boost::filesystem::path const& /*filename*/) override | ||
| 509 | 39 | { | ||
| 510 | 40 | } | ||
| 511 | 41 | void loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) override | ||
| 512 | 42 | { | ||
| 513 | 43 | } | ||
| 514 | 44 | }; | ||
| 515 | 45 | |||
| 516 | 46 | } | ||
| 517 | 47 | } | ||
| 518 | 48 | |||
| 519 | 49 | #endif /* MIR_LOGGING_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ */ | ||
| 520 | 0 | 50 | ||
| 521 | === added file 'include/shared/mir/logging/shared_library_prober_report.h' | |||
| 522 | --- include/shared/mir/logging/shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 523 | +++ include/shared/mir/logging/shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 524 | @@ -0,0 +1,48 @@ | |||
| 525 | 1 | /* | ||
| 526 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 527 | 3 | * | ||
| 528 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 529 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 530 | 6 | * published by the Free Software Foundation. | ||
| 531 | 7 | * | ||
| 532 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 533 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 534 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 535 | 11 | * GNU Lesser General Public License for more details. | ||
| 536 | 12 | * | ||
| 537 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 538 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 539 | 15 | * | ||
| 540 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 541 | 17 | */ | ||
| 542 | 18 | |||
| 543 | 19 | #ifndef MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 544 | 20 | #define MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 545 | 21 | |||
| 546 | 22 | #include "mir/shared_library_prober_report.h" | ||
| 547 | 23 | #include <memory> | ||
| 548 | 24 | |||
| 549 | 25 | namespace mir | ||
| 550 | 26 | { | ||
| 551 | 27 | namespace logging | ||
| 552 | 28 | { | ||
| 553 | 29 | class Logger; | ||
| 554 | 30 | |||
| 555 | 31 | class SharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 556 | 32 | { | ||
| 557 | 33 | public: | ||
| 558 | 34 | SharedLibraryProberReport(std::shared_ptr<Logger> const& logger); | ||
| 559 | 35 | |||
| 560 | 36 | void probing_path(boost::filesystem::path const& path) override; | ||
| 561 | 37 | void probing_failed(boost::filesystem::path const& path, std::exception const& error) override; | ||
| 562 | 38 | void loading_library(boost::filesystem::path const& filename) override; | ||
| 563 | 39 | void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override; | ||
| 564 | 40 | |||
| 565 | 41 | private: | ||
| 566 | 42 | std::shared_ptr<Logger> const logger; | ||
| 567 | 43 | }; | ||
| 568 | 44 | |||
| 569 | 45 | } | ||
| 570 | 46 | } | ||
| 571 | 47 | |||
| 572 | 48 | #endif /* MIR_LOGGING_SHARED_LIBRARY_PROBER_REPORT_H_ */ | ||
| 573 | 0 | 49 | ||
| 574 | === added file 'include/shared/mir/shared_library_prober.h' | |||
| 575 | --- include/shared/mir/shared_library_prober.h 1970-01-01 00:00:00 +0000 | |||
| 576 | +++ include/shared/mir/shared_library_prober.h 2014-08-29 01:18:58 +0000 | |||
| 577 | @@ -0,0 +1,36 @@ | |||
| 578 | 1 | /* | ||
| 579 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 580 | 3 | * | ||
| 581 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 582 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 583 | 6 | * as published by the Free Software Foundation. | ||
| 584 | 7 | * | ||
| 585 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 586 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 587 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 588 | 11 | * GNU Lesser General Public License for more details. | ||
| 589 | 12 | * | ||
| 590 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 591 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 592 | 15 | * | ||
| 593 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 594 | 17 | */ | ||
| 595 | 18 | |||
| 596 | 19 | #ifndef MIR_SHARED_LIBRARY_PROBER_H_ | ||
| 597 | 20 | #define MIR_SHARED_LIBRARY_PROBER_H_ | ||
| 598 | 21 | |||
| 599 | 22 | #include "shared_library_prober_report.h" | ||
| 600 | 23 | |||
| 601 | 24 | #include <string> | ||
| 602 | 25 | #include <vector> | ||
| 603 | 26 | #include <memory> | ||
| 604 | 27 | |||
| 605 | 28 | namespace mir | ||
| 606 | 29 | { | ||
| 607 | 30 | class SharedLibrary; | ||
| 608 | 31 | |||
| 609 | 32 | std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report); | ||
| 610 | 33 | } | ||
| 611 | 34 | |||
| 612 | 35 | |||
| 613 | 36 | #endif /* MIR_SHARED_LIBRARY_PROBER_H_ */ | ||
| 614 | 0 | 37 | ||
| 615 | === added file 'include/shared/mir/shared_library_prober_report.h' | |||
| 616 | --- include/shared/mir/shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 617 | +++ include/shared/mir/shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 618 | @@ -0,0 +1,44 @@ | |||
| 619 | 1 | /* | ||
| 620 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 621 | 3 | * | ||
| 622 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 623 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 624 | 6 | * as published by the Free Software Foundation. | ||
| 625 | 7 | * | ||
| 626 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 627 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 628 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 629 | 11 | * GNU Lesser General Public License for more details. | ||
| 630 | 12 | * | ||
| 631 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 632 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 633 | 15 | * | ||
| 634 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 635 | 17 | */ | ||
| 636 | 18 | |||
| 637 | 19 | #ifndef MIR_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 638 | 20 | #define MIR_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 639 | 21 | |||
| 640 | 22 | #include <boost/filesystem.hpp> | ||
| 641 | 23 | |||
| 642 | 24 | namespace mir | ||
| 643 | 25 | { | ||
| 644 | 26 | class SharedLibraryProberReport | ||
| 645 | 27 | { | ||
| 646 | 28 | public: | ||
| 647 | 29 | virtual ~SharedLibraryProberReport() = default; | ||
| 648 | 30 | |||
| 649 | 31 | virtual void probing_path(boost::filesystem::path const& path) = 0; | ||
| 650 | 32 | virtual void probing_failed(boost::filesystem::path const& path, std::exception const& error) = 0; | ||
| 651 | 33 | virtual void loading_library(boost::filesystem::path const& filename) = 0; | ||
| 652 | 34 | virtual void loading_failed(boost::filesystem::path const& filename, std::exception const& error) = 0; | ||
| 653 | 35 | |||
| 654 | 36 | protected: | ||
| 655 | 37 | SharedLibraryProberReport() = default; | ||
| 656 | 38 | SharedLibraryProberReport(SharedLibraryProberReport const&) = delete; | ||
| 657 | 39 | SharedLibraryProberReport& operator=(SharedLibraryProberReport const&) = delete; | ||
| 658 | 40 | }; | ||
| 659 | 41 | } | ||
| 660 | 42 | |||
| 661 | 43 | |||
| 662 | 44 | #endif /* MIR_SHARED_LIBRARY_PROBER_REPORT_H_ */ | ||
| 663 | 0 | 45 | ||
| 664 | === modified file 'include/shared/mir_toolkit/mesa/native_display.h' | |||
| 665 | --- include/shared/mir_toolkit/mesa/native_display.h 2013-08-28 03:41:48 +0000 | |||
| 666 | +++ include/shared/mir_toolkit/mesa/native_display.h 2014-08-29 01:18:58 +0000 | |||
| 667 | @@ -39,7 +39,7 @@ | |||
| 668 | 39 | struct MirMesaEGLNativeDisplay | 39 | struct MirMesaEGLNativeDisplay |
| 669 | 40 | { | 40 | { |
| 670 | 41 | int (*display_get_platform)(MirMesaEGLNativeDisplay* display, | 41 | int (*display_get_platform)(MirMesaEGLNativeDisplay* display, |
| 672 | 42 | MirPlatformPackage* package); | 42 | MirPlatformPackage* package); |
| 673 | 43 | void *context; | 43 | void *context; |
| 674 | 44 | }; | 44 | }; |
| 675 | 45 | 45 | ||
| 676 | @@ -47,9 +47,9 @@ | |||
| 677 | 47 | { | 47 | { |
| 678 | 48 | int (*surface_set_swapinterval)(MirMesaEGLNativeSurface* surface, int interval); | 48 | int (*surface_set_swapinterval)(MirMesaEGLNativeSurface* surface, int interval); |
| 679 | 49 | int (*surface_advance_buffer)(MirMesaEGLNativeSurface* surface, | 49 | int (*surface_advance_buffer)(MirMesaEGLNativeSurface* surface, |
| 681 | 50 | MirBufferPackage* buffer_package); | 50 | MirBufferPackage* buffer_package); |
| 682 | 51 | int (*surface_get_parameters)(MirMesaEGLNativeSurface* surface, | 51 | int (*surface_get_parameters)(MirMesaEGLNativeSurface* surface, |
| 684 | 52 | MirSurfaceParameters* surface_parameters); | 52 | MirSurfaceParameters* surface_parameters); |
| 685 | 53 | }; | 53 | }; |
| 686 | 54 | 54 | ||
| 687 | 55 | typedef int (*MirMesaEGLNativeDisplayIsValidFunc)(MirMesaEGLNativeDisplay* display); | 55 | typedef int (*MirMesaEGLNativeDisplayIsValidFunc)(MirMesaEGLNativeDisplay* display); |
| 688 | 56 | 56 | ||
| 689 | === modified file 'include/test/mir_test_doubles/mock_android_alloc_device.h' | |||
| 690 | --- include/test/mir_test_doubles/mock_android_alloc_device.h 2013-06-18 08:00:49 +0000 | |||
| 691 | +++ include/test/mir_test_doubles/mock_android_alloc_device.h 2014-08-29 01:18:58 +0000 | |||
| 692 | @@ -19,7 +19,12 @@ | |||
| 693 | 19 | #define MIR_TEST_DOUBLES_MOCK_ANDROID_ALLOC_DEVICE_H_ | 19 | #define MIR_TEST_DOUBLES_MOCK_ANDROID_ALLOC_DEVICE_H_ |
| 694 | 20 | 20 | ||
| 695 | 21 | #include <gmock/gmock.h> | 21 | #include <gmock/gmock.h> |
| 696 | 22 | |||
| 697 | 23 | #pragma GCC diagnostic push | ||
| 698 | 24 | #pragma GCC diagnostic ignored "-Wpedantic" | ||
| 699 | 25 | #pragma GCC diagnostic ignored "-Wunused-parameter" | ||
| 700 | 22 | #include <hardware/gralloc.h> | 26 | #include <hardware/gralloc.h> |
| 701 | 27 | #pragma GCC diagnostic pop | ||
| 702 | 23 | 28 | ||
| 703 | 24 | namespace mir | 29 | namespace mir |
| 704 | 25 | { | 30 | { |
| 705 | 26 | 31 | ||
| 706 | === modified file 'include/test/mir_test_doubles/mock_android_hw.h' | |||
| 707 | --- include/test/mir_test_doubles/mock_android_hw.h 2013-05-20 15:55:48 +0000 | |||
| 708 | +++ include/test/mir_test_doubles/mock_android_hw.h 2014-08-29 01:18:58 +0000 | |||
| 709 | @@ -21,7 +21,12 @@ | |||
| 710 | 21 | #include "mir_test_doubles/mock_android_alloc_device.h" | 21 | #include "mir_test_doubles/mock_android_alloc_device.h" |
| 711 | 22 | #include "mir_test_doubles/mock_hwc_composer_device_1.h" | 22 | #include "mir_test_doubles/mock_hwc_composer_device_1.h" |
| 712 | 23 | 23 | ||
| 713 | 24 | #pragma GCC diagnostic push | ||
| 714 | 25 | #pragma GCC diagnostic ignored "-Wpedantic" | ||
| 715 | 26 | #pragma GCC diagnostic ignored "-Wunused-parameter" | ||
| 716 | 24 | #include <hardware/hardware.h> | 27 | #include <hardware/hardware.h> |
| 717 | 28 | #pragma GCC diagnostic pop | ||
| 718 | 29 | |||
| 719 | 25 | #include <gmock/gmock.h> | 30 | #include <gmock/gmock.h> |
| 720 | 26 | #include <memory> | 31 | #include <memory> |
| 721 | 27 | 32 | ||
| 722 | 28 | 33 | ||
| 723 | === modified file 'include/test/mir_test_doubles/mock_hwc_composer_device_1.h' | |||
| 724 | --- include/test/mir_test_doubles/mock_hwc_composer_device_1.h 2014-03-26 05:48:59 +0000 | |||
| 725 | +++ include/test/mir_test_doubles/mock_hwc_composer_device_1.h 2014-08-29 01:18:58 +0000 | |||
| 726 | @@ -19,7 +19,12 @@ | |||
| 727 | 19 | #ifndef MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_ | 19 | #ifndef MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_ |
| 728 | 20 | #define MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_ | 20 | #define MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_ |
| 729 | 21 | 21 | ||
| 730 | 22 | #pragma GCC diagnostic push | ||
| 731 | 23 | #pragma GCC diagnostic ignored "-Wpedantic" | ||
| 732 | 24 | #pragma GCC diagnostic ignored "-Wunused-parameter" | ||
| 733 | 22 | #include <hardware/hwcomposer.h> | 25 | #include <hardware/hwcomposer.h> |
| 734 | 26 | #pragma GCC diagnostic pop | ||
| 735 | 27 | |||
| 736 | 23 | #include <gmock/gmock.h> | 28 | #include <gmock/gmock.h> |
| 737 | 24 | 29 | ||
| 738 | 25 | namespace mir | 30 | namespace mir |
| 739 | 26 | 31 | ||
| 740 | === added file 'include/test/mir_test_framework/client_platform_factory.h' | |||
| 741 | --- include/test/mir_test_framework/client_platform_factory.h 1970-01-01 00:00:00 +0000 | |||
| 742 | +++ include/test/mir_test_framework/client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 743 | @@ -0,0 +1,72 @@ | |||
| 744 | 1 | /* | ||
| 745 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 746 | 3 | * | ||
| 747 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 748 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
| 749 | 6 | * published by the Free Software Foundation. | ||
| 750 | 7 | * | ||
| 751 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 752 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 753 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 754 | 11 | * GNU General Public License for more details. | ||
| 755 | 12 | * | ||
| 756 | 13 | * You should have received a copy of the GNU General Public License | ||
| 757 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 758 | 15 | * | ||
| 759 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 760 | 17 | */ | ||
| 761 | 18 | |||
| 762 | 19 | #ifndef MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_ | ||
| 763 | 20 | #define MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_ | ||
| 764 | 21 | |||
| 765 | 22 | |||
| 766 | 23 | #include "mir/shared_library.h" | ||
| 767 | 24 | #include "src/client/client_platform_factory.h" | ||
| 768 | 25 | #include "executable_path.h" | ||
| 769 | 26 | #include "mir_test_doubles/mock_client_context.h" | ||
| 770 | 27 | |||
| 771 | 28 | namespace mtd = mir::test::doubles; | ||
| 772 | 29 | |||
| 773 | 30 | namespace mir_test_framework | ||
| 774 | 31 | { | ||
| 775 | 32 | std::shared_ptr<mir::SharedLibrary> platform_library; | ||
| 776 | 33 | |||
| 777 | 34 | std::shared_ptr<mir::client::ClientPlatform> create_android_client_platform() | ||
| 778 | 35 | { | ||
| 779 | 36 | using namespace testing; | ||
| 780 | 37 | mtd::MockClientContext ctx; | ||
| 781 | 38 | ON_CALL(ctx, populate(_)) | ||
| 782 | 39 | .WillByDefault(Invoke([](MirPlatformPackage& package) { ::memset(&package, 0, sizeof(package)); })); | ||
| 783 | 40 | platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-platform-android.so"); | ||
| 784 | 41 | auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform"); | ||
| 785 | 42 | return platform_factory(&ctx); | ||
| 786 | 43 | } | ||
| 787 | 44 | |||
| 788 | 45 | std::shared_ptr<mir::client::ClientPlatform> create_mesa_client_platform() | ||
| 789 | 46 | { | ||
| 790 | 47 | using namespace testing; | ||
| 791 | 48 | mtd::MockClientContext ctx; | ||
| 792 | 49 | ON_CALL(ctx, populate(_)) | ||
| 793 | 50 | .WillByDefault(Invoke([](MirPlatformPackage& package) | ||
| 794 | 51 | { | ||
| 795 | 52 | ::memset(&package, 0, sizeof(package)); | ||
| 796 | 53 | package.fd_items = 1; | ||
| 797 | 54 | })); | ||
| 798 | 55 | platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-platform-mesa.so"); | ||
| 799 | 56 | auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform"); | ||
| 800 | 57 | return platform_factory(&ctx); | ||
| 801 | 58 | } | ||
| 802 | 59 | |||
| 803 | 60 | std::shared_ptr<mir::SharedLibrary> | ||
| 804 | 61 | get_platform_library() | ||
| 805 | 62 | { | ||
| 806 | 63 | if (!platform_library) | ||
| 807 | 64 | { | ||
| 808 | 65 | throw std::logic_error{"Must call one of create_*_client_platform() before calling get_platform_library()"}; | ||
| 809 | 66 | } | ||
| 810 | 67 | return platform_library; | ||
| 811 | 68 | } | ||
| 812 | 69 | |||
| 813 | 70 | } | ||
| 814 | 71 | |||
| 815 | 72 | #endif // MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_ | ||
| 816 | 0 | 73 | ||
| 817 | === modified file 'include/test/mir_test_framework/executable_path.h' | |||
| 818 | --- include/test/mir_test_framework/executable_path.h 2014-07-29 12:28:04 +0000 | |||
| 819 | +++ include/test/mir_test_framework/executable_path.h 2014-08-29 01:18:58 +0000 | |||
| 820 | @@ -24,5 +24,7 @@ | |||
| 821 | 24 | namespace mir_test_framework | 24 | namespace mir_test_framework |
| 822 | 25 | { | 25 | { |
| 823 | 26 | std::string executable_path(); | 26 | std::string executable_path(); |
| 824 | 27 | |||
| 825 | 28 | std::string library_path(); | ||
| 826 | 27 | } | 29 | } |
| 827 | 28 | #endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */ | 30 | #endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */ |
| 828 | 29 | 31 | ||
| 829 | === added file 'include/test/mir_test_framework/stub_client_platform_factory.h' | |||
| 830 | --- include/test/mir_test_framework/stub_client_platform_factory.h 1970-01-01 00:00:00 +0000 | |||
| 831 | +++ include/test/mir_test_framework/stub_client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 832 | @@ -0,0 +1,33 @@ | |||
| 833 | 1 | /* | ||
| 834 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 835 | 3 | * | ||
| 836 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 837 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 838 | 6 | * as published by the Free Software Foundation. | ||
| 839 | 7 | * | ||
| 840 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 841 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 842 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 843 | 11 | * GNU General Public License for more details. | ||
| 844 | 12 | * | ||
| 845 | 13 | * You should have received a copy of the GNU General Public License | ||
| 846 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 847 | 15 | * | ||
| 848 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 849 | 17 | */ | ||
| 850 | 18 | |||
| 851 | 19 | #ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_ | ||
| 852 | 20 | #define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_ | ||
| 853 | 21 | |||
| 854 | 22 | #include "src/client/client_platform_factory.h" | ||
| 855 | 23 | |||
| 856 | 24 | namespace mir_test_framework | ||
| 857 | 25 | { | ||
| 858 | 26 | |||
| 859 | 27 | struct StubClientPlatformFactory : public mir::client::ClientPlatformFactory | ||
| 860 | 28 | { | ||
| 861 | 29 | std::shared_ptr<mir::client::ClientPlatform> create_client_platform(mir::client::ClientContext* context) override; | ||
| 862 | 30 | }; | ||
| 863 | 31 | |||
| 864 | 32 | } | ||
| 865 | 33 | #endif /* MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_ */ | ||
| 866 | 0 | 34 | ||
| 867 | === modified file 'platform-ABI-sha1sums' | |||
| 868 | --- platform-ABI-sha1sums 2014-08-26 20:03:10 +0000 | |||
| 869 | +++ platform-ABI-sha1sums 2014-08-29 01:18:58 +0000 | |||
| 870 | @@ -33,15 +33,14 @@ | |||
| 871 | 33 | 590572a9d86a9481b4531ad44414c6f76352fe7a include/platform/mir/graphics/nested_context.h | 33 | 590572a9d86a9481b4531ad44414c6f76352fe7a include/platform/mir/graphics/nested_context.h |
| 872 | 34 | 27807b8ba288590f3749cfb32512eda4d0de6c7d include/platform/mir/graphics/overlapping_output_grouping.h | 34 | 27807b8ba288590f3749cfb32512eda4d0de6c7d include/platform/mir/graphics/overlapping_output_grouping.h |
| 873 | 35 | 32c70ee44b8dc9372dec0c54471aa8d831adcb1c include/platform/mir/graphics/pixel_format_utils.h | 35 | 32c70ee44b8dc9372dec0c54471aa8d831adcb1c include/platform/mir/graphics/pixel_format_utils.h |
| 875 | 36 | 656a7e1ae3b246930431a6174526fbdc2c76649e include/platform/mir/graphics/platform.h | 36 | e317f93ccaf160d507908b92a91745e61e550793 include/platform/mir/graphics/platform.h |
| 876 | 37 | 9c7712af84b6fde1970ff802ad2ea78f892c7b7e include/platform/mir/graphics/platform_ipc_package.h | 37 | 9c7712af84b6fde1970ff802ad2ea78f892c7b7e include/platform/mir/graphics/platform_ipc_package.h |
| 877 | 38 | 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h | 38 | 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h |
| 878 | 39 | 4b640ec72b04cc2de7671afd7c78942fb9e775a7 include/platform/mir/graphics/tessellation_helpers.h | 39 | 4b640ec72b04cc2de7671afd7c78942fb9e775a7 include/platform/mir/graphics/tessellation_helpers.h |
| 880 | 40 | 8f172d1449f9aa7bbcb1eebb463b0cab4cab38fe include/platform/mir/options/configuration.h | 40 | d84a16fe115bdc37b2177aa1dbf078da78ba08ac include/platform/mir/options/configuration.h |
| 881 | 41 | 3a961c5e85b0b9d20eadddd938677776288c06c6 include/platform/mir/options/default_configuration.h | 41 | 3a961c5e85b0b9d20eadddd938677776288c06c6 include/platform/mir/options/default_configuration.h |
| 882 | 42 | b45f14082c4f8b29efaa1b13de795dcb29deb738 include/platform/mir/options/option.h | 42 | b45f14082c4f8b29efaa1b13de795dcb29deb738 include/platform/mir/options/option.h |
| 883 | 43 | 1133726e66a246bd3988616e205e186278a64731 include/platform/mir/options/program_option.h | 43 | 1133726e66a246bd3988616e205e186278a64731 include/platform/mir/options/program_option.h |
| 884 | 44 | 5d0213652adc4821a2a180ced74808ca0bbf2c45 include/platform/mir/shared_library_loader.h | ||
| 885 | 45 | 6ad1f35928df9ffd917fbf17cbcdd533a8b5b27d include/shared/mir/basic_observers.h | 44 | 6ad1f35928df9ffd917fbf17cbcdd533a8b5b27d include/shared/mir/basic_observers.h |
| 886 | 46 | 3329ada91412ded2f127aee9a92f065e57b81cb2 include/shared/mir/cached_ptr.h | 45 | 3329ada91412ded2f127aee9a92f065e57b81cb2 include/shared/mir/cached_ptr.h |
| 887 | 47 | 691278e8b89265fa7f11db78dc8a9b530cef6e99 include/shared/mir/default_configuration.h | 46 | 691278e8b89265fa7f11db78dc8a9b530cef6e99 include/shared/mir/default_configuration.h |
| 888 | @@ -72,18 +71,22 @@ | |||
| 889 | 72 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h | 71 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h |
| 890 | 73 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h | 72 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h |
| 891 | 74 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h | 73 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h |
| 892 | 74 | 2697f3edce3b3120983b402d383bbdead10f5487 include/shared/mir/logging/null_shared_library_prober_report.h | ||
| 893 | 75 | e9e5f22fe9deb8965946be0f85ea3d255baca740 include/shared/mir/logging/shared_library_prober_report.h | ||
| 894 | 75 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h | 76 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h |
| 895 | 76 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h | 77 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h |
| 896 | 77 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h | 78 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h |
| 897 | 78 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h | 79 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h |
| 898 | 79 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h | 80 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h |
| 899 | 80 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h | 81 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h |
| 900 | 82 | 4d80544bf59ef452979b934d664ac592aff58c82 include/shared/mir/shared_library_prober.h | ||
| 901 | 83 | 53e4159f2a0b564cb39a7785b4e229f6f7424779 include/shared/mir/shared_library_prober_report.h | ||
| 902 | 81 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h | 84 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h |
| 903 | 82 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h | 85 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h |
| 904 | 83 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h | 86 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h |
| 905 | 84 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h | 87 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h |
| 906 | 85 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h | 88 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h |
| 908 | 86 | 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/shared/mir_toolkit/mesa/native_display.h | 89 | 4975998aa1056ed0d39dcc538127453e516ad8e9 include/shared/mir_toolkit/mesa/native_display.h |
| 909 | 87 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h | 90 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h |
| 910 | 88 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h | 91 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h |
| 911 | 89 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h | 92 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h |
| 912 | 90 | 93 | ||
| 913 | === modified file 'server-ABI-sha1sums' | |||
| 914 | --- server-ABI-sha1sums 2014-08-26 20:03:10 +0000 | |||
| 915 | +++ server-ABI-sha1sums 2014-08-29 01:18:58 +0000 | |||
| 916 | @@ -33,15 +33,14 @@ | |||
| 917 | 33 | 590572a9d86a9481b4531ad44414c6f76352fe7a include/platform/mir/graphics/nested_context.h | 33 | 590572a9d86a9481b4531ad44414c6f76352fe7a include/platform/mir/graphics/nested_context.h |
| 918 | 34 | 27807b8ba288590f3749cfb32512eda4d0de6c7d include/platform/mir/graphics/overlapping_output_grouping.h | 34 | 27807b8ba288590f3749cfb32512eda4d0de6c7d include/platform/mir/graphics/overlapping_output_grouping.h |
| 919 | 35 | 32c70ee44b8dc9372dec0c54471aa8d831adcb1c include/platform/mir/graphics/pixel_format_utils.h | 35 | 32c70ee44b8dc9372dec0c54471aa8d831adcb1c include/platform/mir/graphics/pixel_format_utils.h |
| 921 | 36 | 656a7e1ae3b246930431a6174526fbdc2c76649e include/platform/mir/graphics/platform.h | 36 | e317f93ccaf160d507908b92a91745e61e550793 include/platform/mir/graphics/platform.h |
| 922 | 37 | 9c7712af84b6fde1970ff802ad2ea78f892c7b7e include/platform/mir/graphics/platform_ipc_package.h | 37 | 9c7712af84b6fde1970ff802ad2ea78f892c7b7e include/platform/mir/graphics/platform_ipc_package.h |
| 923 | 38 | 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h | 38 | 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h |
| 924 | 39 | 4b640ec72b04cc2de7671afd7c78942fb9e775a7 include/platform/mir/graphics/tessellation_helpers.h | 39 | 4b640ec72b04cc2de7671afd7c78942fb9e775a7 include/platform/mir/graphics/tessellation_helpers.h |
| 926 | 40 | 8f172d1449f9aa7bbcb1eebb463b0cab4cab38fe include/platform/mir/options/configuration.h | 40 | d84a16fe115bdc37b2177aa1dbf078da78ba08ac include/platform/mir/options/configuration.h |
| 927 | 41 | 3a961c5e85b0b9d20eadddd938677776288c06c6 include/platform/mir/options/default_configuration.h | 41 | 3a961c5e85b0b9d20eadddd938677776288c06c6 include/platform/mir/options/default_configuration.h |
| 928 | 42 | b45f14082c4f8b29efaa1b13de795dcb29deb738 include/platform/mir/options/option.h | 42 | b45f14082c4f8b29efaa1b13de795dcb29deb738 include/platform/mir/options/option.h |
| 929 | 43 | 1133726e66a246bd3988616e205e186278a64731 include/platform/mir/options/program_option.h | 43 | 1133726e66a246bd3988616e205e186278a64731 include/platform/mir/options/program_option.h |
| 930 | 44 | 5d0213652adc4821a2a180ced74808ca0bbf2c45 include/platform/mir/shared_library_loader.h | ||
| 931 | 45 | 505444aeb61d0f55893a7ba0998b25c2041f76c4 include/server/mir/asio_main_loop.h | 44 | 505444aeb61d0f55893a7ba0998b25c2041f76c4 include/server/mir/asio_main_loop.h |
| 932 | 46 | a4c8f0b0c30784ea6930a8ee6651f1d6efa47231 include/server/mir/compositor/buffer_stream.h | 45 | a4c8f0b0c30784ea6930a8ee6651f1d6efa47231 include/server/mir/compositor/buffer_stream.h |
| 933 | 47 | f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb include/server/mir/compositor/compositor.h | 46 | f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb include/server/mir/compositor/compositor.h |
| 934 | @@ -58,7 +57,7 @@ | |||
| 935 | 58 | 51391bd29f7499f8cbb89e4ba33acf2b72d93592 include/server/mir/compositor/renderer.h | 57 | 51391bd29f7499f8cbb89e4ba33acf2b72d93592 include/server/mir/compositor/renderer.h |
| 936 | 59 | 686a839fd0cd5fa469344dc49190ff9d578efc25 include/server/mir/compositor/scene_element.h | 58 | 686a839fd0cd5fa469344dc49190ff9d578efc25 include/server/mir/compositor/scene_element.h |
| 937 | 60 | 4fcf34e424128b87ddc76733594e32e09ebbd486 include/server/mir/compositor/scene.h | 59 | 4fcf34e424128b87ddc76733594e32e09ebbd486 include/server/mir/compositor/scene.h |
| 939 | 61 | f102d38fd8afd63b636d76005f9b80f3adda0858 include/server/mir/default_server_configuration.h | 60 | d69ff1401221ffa9adce7f8d85074a6f8b234baf include/server/mir/default_server_configuration.h |
| 940 | 62 | bbb15c910dbc8d7c9a4cc982890486b7e16197e4 include/server/mir/default_server_status_listener.h | 61 | bbb15c910dbc8d7c9a4cc982890486b7e16197e4 include/server/mir/default_server_status_listener.h |
| 941 | 63 | 215f6cf88826381cd3ec37a6d2179a70093c0bc5 include/server/mir/display_changer.h | 62 | 215f6cf88826381cd3ec37a6d2179a70093c0bc5 include/server/mir/display_changer.h |
| 942 | 64 | af1ff0714be973ac76d56006a2e5991f68cd1dec include/server/mir/display_server.h | 63 | af1ff0714be973ac76d56006a2e5991f68cd1dec include/server/mir/display_server.h |
| 943 | @@ -181,18 +180,22 @@ | |||
| 944 | 181 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h | 180 | 2319b60bf87801a93af636d3bbfbae420f6776a4 include/shared/mir/logging/dumb_console_logger.h |
| 945 | 182 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h | 181 | 52cb642982f7f4fa623cf041b11eca126a3df0f4 include/shared/mir/logging/input_timestamp.h |
| 946 | 183 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h | 182 | 72e20902d70588af73bea7a524337264b853bf0a include/shared/mir/logging/logger.h |
| 947 | 183 | 2697f3edce3b3120983b402d383bbdead10f5487 include/shared/mir/logging/null_shared_library_prober_report.h | ||
| 948 | 184 | e9e5f22fe9deb8965946be0f85ea3d255baca740 include/shared/mir/logging/shared_library_prober_report.h | ||
| 949 | 184 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h | 185 | f199066a30882b22be901de0c4e6aa62e320e593 include/shared/mir/protobuf/google_protobuf_guard.h |
| 950 | 185 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h | 186 | 4b4b8d7ae1cd870aeec6399afd6dbd56205c80b2 include/shared/mir/raii.h |
| 951 | 186 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h | 187 | bb27ec04b2861d128f420698491941f71e1aefc0 include/shared/mir/recursive_read_write_mutex.h |
| 952 | 187 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h | 188 | 903210453b98267e47c03ab2920c1db047ba0457 include/shared/mir/report/lttng/mir_tracepoint.h |
| 953 | 188 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h | 189 | 52b6b60543a361e91dbeaa2549114239f57b6b4e include/shared/mir/report/lttng/tracepoint_provider.h |
| 954 | 189 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h | 190 | dc80f8a57f133276dd5a72f4d0360a7b71154d16 include/shared/mir/shared_library.h |
| 955 | 191 | 4d80544bf59ef452979b934d664ac592aff58c82 include/shared/mir/shared_library_prober.h | ||
| 956 | 192 | 53e4159f2a0b564cb39a7785b4e229f6f7424779 include/shared/mir/shared_library_prober_report.h | ||
| 957 | 190 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h | 193 | b4e96264b9a57a1f2ceceb700c5379658905ded7 include/shared/mir/thread_name.h |
| 958 | 191 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h | 194 | 9907751d046e4aea81881cf19e5df52c7a6a813e include/shared/mir_toolkit/client_types.h |
| 959 | 192 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h | 195 | 183d9e5e6cfe48b3d9145a28541dd4202ff6137b include/shared/mir_toolkit/common.h |
| 960 | 193 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h | 196 | fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/shared/mir_toolkit/cursors.h |
| 961 | 194 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h | 197 | bdaceadd56e41d2cb708f7c4da97acf84dfc75b7 include/shared/mir_toolkit/event.h |
| 963 | 195 | 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/shared/mir_toolkit/mesa/native_display.h | 198 | 4975998aa1056ed0d39dcc538127453e516ad8e9 include/shared/mir_toolkit/mesa/native_display.h |
| 964 | 196 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h | 199 | 101017c17714a57db57d79b7b5e7df40a3568236 include/shared/mir_toolkit/mir_native_buffer.h |
| 965 | 197 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h | 200 | 9f646fa12eaca5fc3b7a8fde6208673c071c8ef3 include/shared/mir/udev/wrapper.h |
| 966 | 198 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h | 201 | 9fd77ab693cc4c9a200e44804f5493733528a674 include/shared/mir/variable_length_array.h |
| 967 | 199 | 202 | ||
| 968 | === modified file 'src/client/CMakeLists.txt' | |||
| 969 | --- src/client/CMakeLists.txt 2014-08-25 03:11:01 +0000 | |||
| 970 | +++ src/client/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 971 | @@ -16,6 +16,16 @@ | |||
| 972 | 16 | ${DRM_INCLUDE_DIRS} | 16 | ${DRM_INCLUDE_DIRS} |
| 973 | 17 | ) | 17 | ) |
| 974 | 18 | 18 | ||
| 975 | 19 | set(MIRCLIENT_ABI 8) | ||
| 976 | 20 | set(MIRCLIENT_PLATFORM_ABI 1) | ||
| 977 | 21 | set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map) | ||
| 978 | 22 | |||
| 979 | 23 | set(MIR_CLIENT_PLATFORM_PATH | ||
| 980 | 24 | ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform-${MIRCLIENT_PLATFORM_ABI} | ||
| 981 | 25 | ) | ||
| 982 | 26 | |||
| 983 | 27 | add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/") | ||
| 984 | 28 | |||
| 985 | 19 | add_subdirectory(rpc/) | 29 | add_subdirectory(rpc/) |
| 986 | 20 | add_subdirectory(lttng/) | 30 | add_subdirectory(lttng/) |
| 987 | 21 | 31 | ||
| 988 | @@ -54,6 +64,7 @@ | |||
| 989 | 54 | mir_prompt_session.cpp | 64 | mir_prompt_session.cpp |
| 990 | 55 | mir_prompt_session_api.cpp | 65 | mir_prompt_session_api.cpp |
| 991 | 56 | mir_event_distributor.cpp | 66 | mir_event_distributor.cpp |
| 992 | 67 | probing_client_platform_factory.cpp | ||
| 993 | 57 | ) | 68 | ) |
| 994 | 58 | 69 | ||
| 995 | 59 | add_library( | 70 | add_library( |
| 996 | @@ -62,9 +73,6 @@ | |||
| 997 | 62 | $<TARGET_OBJECTS:mirclientobjects> | 73 | $<TARGET_OBJECTS:mirclientobjects> |
| 998 | 63 | ) | 74 | ) |
| 999 | 64 | 75 | ||
| 1000 | 65 | set(MIRCLIENT_ABI 8) | ||
| 1001 | 66 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) | ||
| 1002 | 67 | |||
| 1003 | 68 | set_target_properties( | 76 | set_target_properties( |
| 1004 | 69 | mirclient | 77 | mirclient |
| 1005 | 70 | 78 | ||
| 1006 | @@ -73,8 +81,9 @@ | |||
| 1007 | 73 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | 81 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" |
| 1008 | 74 | ) | 82 | ) |
| 1009 | 75 | 83 | ||
| 1012 | 76 | set( | 84 | target_link_libraries( |
| 1013 | 77 | MIR_CLIENT_LIBRARIES | 85 | mirclient |
| 1014 | 86 | |||
| 1015 | 78 | mirclientrpc | 87 | mirclientrpc |
| 1016 | 79 | mirclientlttngstatic | 88 | mirclientlttngstatic |
| 1017 | 80 | mircommon | 89 | mircommon |
| 1018 | @@ -84,12 +93,6 @@ | |||
| 1019 | 84 | ${XKBCOMMON_LIBRARIES} | 93 | ${XKBCOMMON_LIBRARIES} |
| 1020 | 85 | ) | 94 | ) |
| 1021 | 86 | 95 | ||
| 1022 | 87 | target_link_libraries( | ||
| 1023 | 88 | mirclient | ||
| 1024 | 89 | |||
| 1025 | 90 | ${MIR_CLIENT_LIBRARIES} | ||
| 1026 | 91 | ) | ||
| 1027 | 92 | |||
| 1028 | 93 | install( | 96 | install( |
| 1029 | 94 | TARGETS mirclient | 97 | TARGETS mirclient |
| 1030 | 95 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | 98 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 1031 | 96 | 99 | ||
| 1032 | === modified file 'src/client/android/CMakeLists.txt' | |||
| 1033 | --- src/client/android/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 1034 | +++ src/client/android/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 1035 | @@ -15,17 +15,17 @@ | |||
| 1036 | 15 | ) | 15 | ) |
| 1037 | 16 | 16 | ||
| 1038 | 17 | add_library( | 17 | add_library( |
| 1041 | 18 | mirclientplatformandroid SHARED | 18 | mirclientplatformandroid MODULE |
| 1042 | 19 | 19 | ||
| 1043 | 20 | $<TARGET_OBJECTS:mirclientplatformandroidobjects> | 20 | $<TARGET_OBJECTS:mirclientplatformandroidobjects> |
| 1044 | 21 | $<TARGET_OBJECTS:mirclient_platformimpl> | 21 | $<TARGET_OBJECTS:mirclient_platformimpl> |
| 1045 | 22 | ) | 22 | ) |
| 1046 | 23 | 23 | ||
| 1047 | 24 | set_target_properties( | 24 | set_target_properties( |
| 1048 | 25 | mirclientplatformandroid PROPERTIES | 25 | mirclientplatformandroid PROPERTIES |
| 1052 | 26 | OUTPUT_NAME mirclientplatform | 26 | OUTPUT_NAME client-platform-android |
| 1053 | 27 | LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android | 27 | PREFIX "" |
| 1054 | 28 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | 28 | LINK_FLAGS "-Wl,--version-script,${symbol_map}" |
| 1055 | 29 | ) | 29 | ) |
| 1056 | 30 | 30 | ||
| 1057 | 31 | target_link_libraries( | 31 | target_link_libraries( |
| 1058 | @@ -35,20 +35,4 @@ | |||
| 1059 | 35 | ${LIBHARDWARE_LIBRARIES} | 35 | ${LIBHARDWARE_LIBRARIES} |
| 1060 | 36 | ) | 36 | ) |
| 1061 | 37 | 37 | ||
| 1079 | 38 | install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android) | 38 | install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH}) |
| 1063 | 39 | |||
| 1064 | 40 | if (MIR_TEST_PLATFORM STREQUAL "android") | ||
| 1065 | 41 | add_custom_command(TARGET mirclientplatformandroid | ||
| 1066 | 42 | POST_BUILD | ||
| 1067 | 43 | COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so | ||
| 1068 | 44 | COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so | ||
| 1069 | 45 | WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} | ||
| 1070 | 46 | ) | ||
| 1071 | 47 | |||
| 1072 | 48 | install(CODE | ||
| 1073 | 49 | "execute_process( | ||
| 1074 | 50 | COMMAND ln -sf mir/clientplatform/android/libmirclientplatform.so | ||
| 1075 | 51 | WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} | ||
| 1076 | 52 | )" | ||
| 1077 | 53 | ) | ||
| 1078 | 54 | endif() | ||
| 1080 | 55 | 39 | ||
| 1081 | === modified file 'src/client/android/android_native_display_container.cpp' | |||
| 1082 | --- src/client/android/android_native_display_container.cpp 2014-07-17 13:56:20 +0000 | |||
| 1083 | +++ src/client/android/android_native_display_container.cpp 2014-08-29 01:18:58 +0000 | |||
| 1084 | @@ -62,16 +62,28 @@ | |||
| 1085 | 62 | bool | 62 | bool |
| 1086 | 63 | mcla::AndroidNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const | 63 | mcla::AndroidNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const |
| 1087 | 64 | { | 64 | { |
| 1089 | 65 | return mir_connection_is_valid(static_cast<MirConnection*>(display)); | 65 | std::lock_guard<std::mutex> lg(guard); |
| 1090 | 66 | return (valid_displays.find(display) != valid_displays.end()); | ||
| 1091 | 66 | } | 67 | } |
| 1092 | 67 | 68 | ||
| 1093 | 68 | MirEGLNativeDisplayType | 69 | MirEGLNativeDisplayType |
| 1095 | 69 | mcla::AndroidNativeDisplayContainer::create(MirConnection* connection) | 70 | mcla::AndroidNativeDisplayContainer::create(ClientContext* context) |
| 1096 | 70 | { | 71 | { |
| 1098 | 71 | return static_cast<MirEGLNativeDisplayType>(connection); | 72 | std::lock_guard<std::mutex> lg(guard); |
| 1099 | 73 | auto egl_display = static_cast<MirEGLNativeDisplayType>(context); | ||
| 1100 | 74 | valid_displays.insert(egl_display); | ||
| 1101 | 75 | |||
| 1102 | 76 | return egl_display; | ||
| 1103 | 72 | } | 77 | } |
| 1104 | 73 | 78 | ||
| 1105 | 74 | void | 79 | void |
| 1107 | 75 | mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType /* display */) | 80 | mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType display) |
| 1108 | 76 | { | 81 | { |
| 1109 | 82 | std::lock_guard<std::mutex> lg(guard); | ||
| 1110 | 83 | |||
| 1111 | 84 | auto it = valid_displays.find(display); | ||
| 1112 | 85 | if (it == valid_displays.end()) | ||
| 1113 | 86 | return; | ||
| 1114 | 87 | |||
| 1115 | 88 | valid_displays.erase(it); | ||
| 1116 | 77 | } | 89 | } |
| 1117 | 78 | 90 | ||
| 1118 | === modified file 'src/client/android/android_native_display_container.h' | |||
| 1119 | --- src/client/android/android_native_display_container.h 2013-05-02 00:11:18 +0000 | |||
| 1120 | +++ src/client/android/android_native_display_container.h 2014-08-29 01:18:58 +0000 | |||
| 1121 | @@ -23,6 +23,9 @@ | |||
| 1122 | 23 | 23 | ||
| 1123 | 24 | #include "mir_toolkit/client_types.h" | 24 | #include "mir_toolkit/client_types.h" |
| 1124 | 25 | 25 | ||
| 1125 | 26 | #include <unordered_set> | ||
| 1126 | 27 | #include <mutex> | ||
| 1127 | 28 | |||
| 1128 | 26 | namespace mir | 29 | namespace mir |
| 1129 | 27 | { | 30 | { |
| 1130 | 28 | namespace client | 31 | namespace client |
| 1131 | @@ -36,7 +39,7 @@ | |||
| 1132 | 36 | AndroidNativeDisplayContainer(); | 39 | AndroidNativeDisplayContainer(); |
| 1133 | 37 | virtual ~AndroidNativeDisplayContainer(); | 40 | virtual ~AndroidNativeDisplayContainer(); |
| 1134 | 38 | 41 | ||
| 1136 | 39 | MirEGLNativeDisplayType create(MirConnection* connection); | 42 | MirEGLNativeDisplayType create(ClientContext* context) override; |
| 1137 | 40 | void release(MirEGLNativeDisplayType display); | 43 | void release(MirEGLNativeDisplayType display); |
| 1138 | 41 | 44 | ||
| 1139 | 42 | bool validate(MirEGLNativeDisplayType display) const; | 45 | bool validate(MirEGLNativeDisplayType display) const; |
| 1140 | @@ -44,6 +47,10 @@ | |||
| 1141 | 44 | protected: | 47 | protected: |
| 1142 | 45 | AndroidNativeDisplayContainer(AndroidNativeDisplayContainer const&) = delete; | 48 | AndroidNativeDisplayContainer(AndroidNativeDisplayContainer const&) = delete; |
| 1143 | 46 | AndroidNativeDisplayContainer& operator=(AndroidNativeDisplayContainer const&) = delete; | 49 | AndroidNativeDisplayContainer& operator=(AndroidNativeDisplayContainer const&) = delete; |
| 1144 | 50 | |||
| 1145 | 51 | private: | ||
| 1146 | 52 | std::mutex mutable guard; | ||
| 1147 | 53 | std::unordered_set<MirEGLNativeDisplayType> valid_displays; | ||
| 1148 | 47 | }; | 54 | }; |
| 1149 | 48 | 55 | ||
| 1150 | 49 | } | 56 | } |
| 1151 | 50 | 57 | ||
| 1152 | === modified file 'src/client/android/client_platform_factory.cpp' | |||
| 1153 | --- src/client/android/client_platform_factory.cpp 2014-02-07 15:43:41 +0000 | |||
| 1154 | +++ src/client/android/client_platform_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 1155 | @@ -16,19 +16,35 @@ | |||
| 1156 | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 1157 | 17 | */ | 17 | */ |
| 1158 | 18 | 18 | ||
| 1160 | 19 | #include "client_platform_factory.h" | 19 | #include "../client_platform_factory.h" |
| 1161 | 20 | #include "mir_toolkit/client_types.h" | ||
| 1162 | 21 | #include "../client_context.h" | ||
| 1163 | 20 | #include "android_client_platform.h" | 22 | #include "android_client_platform.h" |
| 1164 | 21 | 23 | ||
| 1165 | 24 | #include <stdexcept> | ||
| 1166 | 25 | |||
| 1167 | 22 | namespace mcl = mir::client; | 26 | namespace mcl = mir::client; |
| 1168 | 23 | namespace mcla = mcl::android; | 27 | namespace mcla = mcl::android; |
| 1169 | 24 | 28 | ||
| 1172 | 25 | std::shared_ptr<mcl::ClientPlatform> | 29 | extern "C" std::shared_ptr<mcl::ClientPlatform> |
| 1173 | 26 | mcla::ClientPlatformFactory::create_client_platform(mcl::ClientContext* /*context*/) | 30 | mcl::create_client_platform(mcl::ClientContext* context) |
| 1174 | 27 | { | 31 | { |
| 1175 | 32 | MirPlatformPackage platform; | ||
| 1176 | 33 | context->populate(platform); | ||
| 1177 | 34 | if (platform.data_items != 0 || platform.fd_items != 0) | ||
| 1178 | 35 | { | ||
| 1179 | 36 | throw new std::runtime_error{"Attempted to create Android client platform on non-Android server"}; | ||
| 1180 | 37 | } | ||
| 1181 | 28 | return std::make_shared<mcla::AndroidClientPlatform>(); | 38 | return std::make_shared<mcla::AndroidClientPlatform>(); |
| 1182 | 29 | } | 39 | } |
| 1183 | 30 | 40 | ||
| 1185 | 31 | extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory() | 41 | extern "C" bool |
| 1186 | 42 | mcl::is_appropriate_module(mcl::ClientContext* context) | ||
| 1187 | 32 | { | 43 | { |
| 1189 | 33 | return std::make_shared<mcla::ClientPlatformFactory>(); | 44 | MirPlatformPackage platform; |
| 1190 | 45 | context->populate(platform); | ||
| 1191 | 46 | // TODO: Actually check what platform we're using, rather than blindly | ||
| 1192 | 47 | // hope we can distinguish them from the stuff they've put in the | ||
| 1193 | 48 | // PlatformPackage. | ||
| 1194 | 49 | return platform.data_items == 0 && platform.fd_items == 0; | ||
| 1195 | 34 | } | 50 | } |
| 1196 | 35 | 51 | ||
| 1197 | === modified file 'src/client/android/client_platform_factory.h' | |||
| 1198 | --- src/client/android/client_platform_factory.h 2014-02-07 15:43:41 +0000 | |||
| 1199 | +++ src/client/android/client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 1200 | @@ -28,11 +28,8 @@ | |||
| 1201 | 28 | namespace android | 28 | namespace android |
| 1202 | 29 | { | 29 | { |
| 1203 | 30 | 30 | ||
| 1209 | 31 | class ClientPlatformFactory : public client::ClientPlatformFactory | 31 | extern "C" std::shared_ptr<ClientPlatform> |
| 1210 | 32 | { | 32 | create_client_platform(ClientContext* context); |
| 1206 | 33 | public: | ||
| 1207 | 34 | std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override; | ||
| 1208 | 35 | }; | ||
| 1211 | 36 | 33 | ||
| 1212 | 37 | } | 34 | } |
| 1213 | 38 | } | 35 | } |
| 1214 | 39 | 36 | ||
| 1215 | === modified file 'src/client/android/symbols.map' | |||
| 1216 | --- src/client/android/symbols.map 2014-08-25 03:11:01 +0000 | |||
| 1217 | +++ src/client/android/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 1218 | @@ -1,5 +1,6 @@ | |||
| 1219 | 1 | MIR_CLIENTPLATFORM_1 { | 1 | MIR_CLIENTPLATFORM_1 { |
| 1220 | 2 | global: | 2 | global: |
| 1222 | 3 | create_client_platform_factory; | 3 | create_client_platform; |
| 1223 | 4 | is_appropriate_module; | ||
| 1224 | 4 | local: *; | 5 | local: *; |
| 1225 | 5 | }; | 6 | }; |
| 1226 | 6 | \ No newline at end of file | 7 | \ No newline at end of file |
| 1227 | 7 | 8 | ||
| 1228 | === modified file 'src/client/client_platform_factory.h' | |||
| 1229 | --- src/client/client_platform_factory.h 2014-03-06 06:05:17 +0000 | |||
| 1230 | +++ src/client/client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 1231 | @@ -41,8 +41,11 @@ | |||
| 1232 | 41 | ClientPlatformFactory& operator=(ClientPlatformFactory const& p) = delete; | 41 | ClientPlatformFactory& operator=(ClientPlatformFactory const& p) = delete; |
| 1233 | 42 | }; | 42 | }; |
| 1234 | 43 | 43 | ||
| 1237 | 44 | extern "C" typedef std::shared_ptr<ClientPlatformFactory>(*CreateClientPlatformFactory)(); | 44 | extern "C" typedef std::shared_ptr<ClientPlatform>(*CreateClientPlatform)(ClientContext* context); |
| 1238 | 45 | extern "C" std::shared_ptr<ClientPlatformFactory> create_client_platform_factory(); | 45 | extern "C" std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context); |
| 1239 | 46 | |||
| 1240 | 47 | extern "C" typedef bool (*ClientPlatformProbe)(ClientContext* context); | ||
| 1241 | 48 | extern "C" bool is_appropriate_module(ClientContext* context); | ||
| 1242 | 46 | 49 | ||
| 1243 | 47 | } | 50 | } |
| 1244 | 48 | } | 51 | } |
| 1245 | 49 | 52 | ||
| 1246 | === modified file 'src/client/default_connection_configuration.cpp' | |||
| 1247 | --- src/client/default_connection_configuration.cpp 2014-08-26 13:38:23 +0000 | |||
| 1248 | +++ src/client/default_connection_configuration.cpp 2014-08-29 01:18:58 +0000 | |||
| 1249 | @@ -26,13 +26,18 @@ | |||
| 1250 | 26 | #include "mir/input/null_input_receiver_report.h" | 26 | #include "mir/input/null_input_receiver_report.h" |
| 1251 | 27 | #include "logging/rpc_report.h" | 27 | #include "logging/rpc_report.h" |
| 1252 | 28 | #include "logging/input_receiver_report.h" | 28 | #include "logging/input_receiver_report.h" |
| 1253 | 29 | #include "mir/logging/shared_library_prober_report.h" | ||
| 1254 | 30 | #include "mir/logging/null_shared_library_prober_report.h" | ||
| 1255 | 29 | #include "lttng/rpc_report.h" | 31 | #include "lttng/rpc_report.h" |
| 1256 | 30 | #include "lttng/input_receiver_report.h" | 32 | #include "lttng/input_receiver_report.h" |
| 1257 | 33 | #include "lttng/shared_library_prober_report.h" | ||
| 1258 | 31 | #include "connection_surface_map.h" | 34 | #include "connection_surface_map.h" |
| 1259 | 32 | #include "lifecycle_control.h" | 35 | #include "lifecycle_control.h" |
| 1260 | 33 | #include "mir/shared_library.h" | 36 | #include "mir/shared_library.h" |
| 1261 | 34 | #include "client_platform_factory.h" | 37 | #include "client_platform_factory.h" |
| 1262 | 38 | #include "probing_client_platform_factory.h" | ||
| 1263 | 35 | #include "mir_event_distributor.h" | 39 | #include "mir_event_distributor.h" |
| 1264 | 40 | #include "mir/shared_library_prober.h" | ||
| 1265 | 36 | 41 | ||
| 1266 | 37 | namespace mcl = mir::client; | 42 | namespace mcl = mir::client; |
| 1267 | 38 | 43 | ||
| 1268 | @@ -41,7 +46,14 @@ | |||
| 1269 | 41 | std::string const off_opt_val{"off"}; | 46 | std::string const off_opt_val{"off"}; |
| 1270 | 42 | std::string const log_opt_val{"log"}; | 47 | std::string const log_opt_val{"log"}; |
| 1271 | 43 | std::string const lttng_opt_val{"lttng"}; | 48 | std::string const lttng_opt_val{"lttng"}; |
| 1272 | 49 | <<<<<<< TREE | ||
| 1273 | 44 | std::string const default_platform_lib{"libmirclientplatform.so"}; | 50 | std::string const default_platform_lib{"libmirclientplatform.so"}; |
| 1274 | 51 | ======= | ||
| 1275 | 52 | |||
| 1276 | 53 | // Shove this here until we properly manage the lifetime of our | ||
| 1277 | 54 | // loadable modules | ||
| 1278 | 55 | std::shared_ptr<mcl::ProbingClientPlatformFactory> the_platform_prober; | ||
| 1279 | 56 | >>>>>>> MERGE-SOURCE | ||
| 1280 | 45 | } | 57 | } |
| 1281 | 46 | 58 | ||
| 1282 | 47 | mcl::DefaultConnectionConfiguration::DefaultConnectionConfiguration( | 59 | mcl::DefaultConnectionConfiguration::DefaultConnectionConfiguration( |
| 1283 | @@ -86,11 +98,30 @@ | |||
| 1284 | 86 | return client_platform_factory( | 98 | return client_platform_factory( |
| 1285 | 87 | [this] | 99 | [this] |
| 1286 | 88 | { | 100 | { |
| 1287 | 101 | <<<<<<< TREE | ||
| 1288 | 89 | auto const create_client_platform_factory = | 102 | auto const create_client_platform_factory = |
| 1289 | 90 | the_platform_library()->load_function<mcl::CreateClientPlatformFactory>( | 103 | the_platform_library()->load_function<mcl::CreateClientPlatformFactory>( |
| 1290 | 91 | "create_client_platform_factory"); | 104 | "create_client_platform_factory"); |
| 1291 | 92 | 105 | ||
| 1292 | 93 | return create_client_platform_factory(); | 106 | return create_client_platform_factory(); |
| 1293 | 107 | ======= | ||
| 1294 | 108 | auto const platform_override = getenv("MIR_CLIENT_PLATFORM_LIB"); | ||
| 1295 | 109 | std::vector<std::shared_ptr<mir::SharedLibrary>> platform_plugins; | ||
| 1296 | 110 | if (platform_override) | ||
| 1297 | 111 | { | ||
| 1298 | 112 | platform_plugins.push_back(std::make_shared<mir::SharedLibrary>(platform_override)); | ||
| 1299 | 113 | } | ||
| 1300 | 114 | else | ||
| 1301 | 115 | { | ||
| 1302 | 116 | auto const platform_path_override = getenv("MIR_CLIENT_PLATFORM_PATH"); | ||
| 1303 | 117 | auto const platform_path = platform_path_override ? platform_path_override : MIR_CLIENT_PLATFORM_PATH; | ||
| 1304 | 118 | platform_plugins = mir::libraries_for_path(platform_path, *the_shared_library_prober_report()); | ||
| 1305 | 119 | } | ||
| 1306 | 120 | |||
| 1307 | 121 | the_platform_prober = std::make_shared<mcl::ProbingClientPlatformFactory>(platform_plugins); | ||
| 1308 | 122 | |||
| 1309 | 123 | return the_platform_prober; | ||
| 1310 | 124 | >>>>>>> MERGE-SOURCE | ||
| 1311 | 94 | }); | 125 | }); |
| 1312 | 95 | } | 126 | } |
| 1313 | 96 | 127 | ||
| 1314 | @@ -181,6 +212,7 @@ | |||
| 1315 | 181 | return std::make_shared<MirEventDistributor>(); | 212 | return std::make_shared<MirEventDistributor>(); |
| 1316 | 182 | }); | 213 | }); |
| 1317 | 183 | } | 214 | } |
| 1318 | 215 | <<<<<<< TREE | ||
| 1319 | 184 | 216 | ||
| 1320 | 185 | std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library() | 217 | std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library() |
| 1321 | 186 | { | 218 | { |
| 1322 | @@ -193,3 +225,22 @@ | |||
| 1323 | 193 | 225 | ||
| 1324 | 194 | return platform_library; | 226 | return platform_library; |
| 1325 | 195 | } | 227 | } |
| 1326 | 228 | ======= | ||
| 1327 | 229 | |||
| 1328 | 230 | std::shared_ptr<mir::SharedLibraryProberReport> mir::client::DefaultConnectionConfiguration::the_shared_library_prober_report() | ||
| 1329 | 231 | { | ||
| 1330 | 232 | return shared_library_prober_report( | ||
| 1331 | 233 | [this] () -> std::shared_ptr<mir::SharedLibraryProberReport> | ||
| 1332 | 234 | { | ||
| 1333 | 235 | auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT"); | ||
| 1334 | 236 | std::string const val{val_raw ? val_raw : off_opt_val}; | ||
| 1335 | 237 | |||
| 1336 | 238 | if (val == log_opt_val) | ||
| 1337 | 239 | return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger()); | ||
| 1338 | 240 | else if (val == lttng_opt_val) | ||
| 1339 | 241 | return std::make_shared<mcl::lttng::SharedLibraryProberReport>(); | ||
| 1340 | 242 | else | ||
| 1341 | 243 | return std::make_shared<mir::logging::NullSharedLibraryProberReport>(); | ||
| 1342 | 244 | }); | ||
| 1343 | 245 | } | ||
| 1344 | 246 | >>>>>>> MERGE-SOURCE | ||
| 1345 | 196 | 247 | ||
| 1346 | === modified file 'src/client/default_connection_configuration.h' | |||
| 1347 | --- src/client/default_connection_configuration.h 2014-08-26 13:38:23 +0000 | |||
| 1348 | +++ src/client/default_connection_configuration.h 2014-08-29 01:18:58 +0000 | |||
| 1349 | @@ -27,6 +27,8 @@ | |||
| 1350 | 27 | 27 | ||
| 1351 | 28 | namespace mir | 28 | namespace mir |
| 1352 | 29 | { | 29 | { |
| 1353 | 30 | class SharedLibraryProberReport; | ||
| 1354 | 31 | |||
| 1355 | 30 | namespace input | 32 | namespace input |
| 1356 | 31 | { | 33 | { |
| 1357 | 32 | namespace receiver | 34 | namespace receiver |
| 1358 | @@ -57,7 +59,11 @@ | |||
| 1359 | 57 | std::shared_ptr<LifecycleControl> the_lifecycle_control(); | 59 | std::shared_ptr<LifecycleControl> the_lifecycle_control(); |
| 1360 | 58 | std::shared_ptr<EventSink> the_event_sink(); | 60 | std::shared_ptr<EventSink> the_event_sink(); |
| 1361 | 59 | std::shared_ptr<EventHandlerRegister> the_event_handler_register(); | 61 | std::shared_ptr<EventHandlerRegister> the_event_handler_register(); |
| 1362 | 62 | <<<<<<< TREE | ||
| 1363 | 60 | std::shared_ptr<SharedLibrary> the_platform_library() override; | 63 | std::shared_ptr<SharedLibrary> the_platform_library() override; |
| 1364 | 64 | ======= | ||
| 1365 | 65 | std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report(); | ||
| 1366 | 66 | >>>>>>> MERGE-SOURCE | ||
| 1367 | 61 | 67 | ||
| 1368 | 62 | virtual std::string the_socket_file(); | 68 | virtual std::string the_socket_file(); |
| 1369 | 63 | virtual std::shared_ptr<rpc::RpcReport> the_rpc_report(); | 69 | virtual std::shared_ptr<rpc::RpcReport> the_rpc_report(); |
| 1370 | @@ -78,6 +84,7 @@ | |||
| 1371 | 78 | 84 | ||
| 1372 | 79 | CachedPtr<rpc::RpcReport> rpc_report; | 85 | CachedPtr<rpc::RpcReport> rpc_report; |
| 1373 | 80 | CachedPtr<input::receiver::InputReceiverReport> input_receiver_report; | 86 | CachedPtr<input::receiver::InputReceiverReport> input_receiver_report; |
| 1374 | 87 | CachedPtr<mir::SharedLibraryProberReport> shared_library_prober_report; | ||
| 1375 | 81 | 88 | ||
| 1376 | 82 | private: | 89 | private: |
| 1377 | 83 | std::string const socket_file; | 90 | std::string const socket_file; |
| 1378 | 84 | 91 | ||
| 1379 | === modified file 'src/client/egl_native_display_container.h' | |||
| 1380 | --- src/client/egl_native_display_container.h 2014-03-06 06:05:17 +0000 | |||
| 1381 | +++ src/client/egl_native_display_container.h 2014-08-29 01:18:58 +0000 | |||
| 1382 | @@ -26,12 +26,14 @@ | |||
| 1383 | 26 | namespace client | 26 | namespace client |
| 1384 | 27 | { | 27 | { |
| 1385 | 28 | 28 | ||
| 1386 | 29 | class ClientContext; | ||
| 1387 | 30 | |||
| 1388 | 29 | class EGLNativeDisplayContainer | 31 | class EGLNativeDisplayContainer |
| 1389 | 30 | { | 32 | { |
| 1390 | 31 | public: | 33 | public: |
| 1391 | 32 | virtual ~EGLNativeDisplayContainer() {} | 34 | virtual ~EGLNativeDisplayContainer() {} |
| 1392 | 33 | 35 | ||
| 1394 | 34 | virtual MirEGLNativeDisplayType create(MirConnection* connection) = 0; | 36 | virtual MirEGLNativeDisplayType create(ClientContext* context) = 0; |
| 1395 | 35 | virtual void release(MirEGLNativeDisplayType display) = 0; | 37 | virtual void release(MirEGLNativeDisplayType display) = 0; |
| 1396 | 36 | 38 | ||
| 1397 | 37 | virtual bool validate(MirEGLNativeDisplayType display) const = 0; | 39 | virtual bool validate(MirEGLNativeDisplayType display) const = 0; |
| 1398 | 38 | 40 | ||
| 1399 | === modified file 'src/client/lttng/CMakeLists.txt' | |||
| 1400 | --- src/client/lttng/CMakeLists.txt 2014-08-22 02:56:00 +0000 | |||
| 1401 | +++ src/client/lttng/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 1402 | @@ -6,6 +6,7 @@ | |||
| 1403 | 6 | client_tracepoint_provider.cpp | 6 | client_tracepoint_provider.cpp |
| 1404 | 7 | rpc_report.cpp | 7 | rpc_report.cpp |
| 1405 | 8 | input_receiver_report.cpp | 8 | input_receiver_report.cpp |
| 1406 | 9 | shared_library_prober_report.cpp | ||
| 1407 | 9 | ) | 10 | ) |
| 1408 | 10 | 11 | ||
| 1409 | 11 | add_library(mirclientlttng SHARED tracepoints.c) | 12 | add_library(mirclientlttng SHARED tracepoints.c) |
| 1410 | 12 | 13 | ||
| 1411 | === added file 'src/client/lttng/shared_library_prober_report.cpp' | |||
| 1412 | --- src/client/lttng/shared_library_prober_report.cpp 1970-01-01 00:00:00 +0000 | |||
| 1413 | +++ src/client/lttng/shared_library_prober_report.cpp 2014-08-29 01:18:58 +0000 | |||
| 1414 | @@ -0,0 +1,50 @@ | |||
| 1415 | 1 | /* | ||
| 1416 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 1417 | 3 | * | ||
| 1418 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 1419 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 1420 | 6 | * published by the Free Software Foundation. | ||
| 1421 | 7 | * | ||
| 1422 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1423 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1424 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1425 | 11 | * GNU Lesser General Public License for more details. | ||
| 1426 | 12 | * | ||
| 1427 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 1428 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1429 | 15 | * | ||
| 1430 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 1431 | 17 | */ | ||
| 1432 | 18 | |||
| 1433 | 19 | #include "shared_library_prober_report.h" | ||
| 1434 | 20 | #include "mir/report/lttng/mir_tracepoint.h" | ||
| 1435 | 21 | |||
| 1436 | 22 | #define TRACEPOINT_DEFINE | ||
| 1437 | 23 | #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE | ||
| 1438 | 24 | #include "shared_library_prober_report_tp.h" | ||
| 1439 | 25 | |||
| 1440 | 26 | namespace mcl = mir::client; | ||
| 1441 | 27 | |||
| 1442 | 28 | void mcl::lttng::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path) | ||
| 1443 | 29 | { | ||
| 1444 | 30 | mir_tracepoint(mir_client_shared_library_prober, probing_path, | ||
| 1445 | 31 | path.string().c_str()); | ||
| 1446 | 32 | } | ||
| 1447 | 33 | |||
| 1448 | 34 | void mcl::lttng::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error) | ||
| 1449 | 35 | { | ||
| 1450 | 36 | mir_tracepoint(mir_client_shared_library_prober, probing_failed, | ||
| 1451 | 37 | path.string().c_str(), error.what()); | ||
| 1452 | 38 | } | ||
| 1453 | 39 | |||
| 1454 | 40 | void mcl::lttng::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename) | ||
| 1455 | 41 | { | ||
| 1456 | 42 | mir_tracepoint(mir_client_shared_library_prober, loading_library, | ||
| 1457 | 43 | filename.string().c_str()); | ||
| 1458 | 44 | } | ||
| 1459 | 45 | |||
| 1460 | 46 | void mcl::lttng::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error) | ||
| 1461 | 47 | { | ||
| 1462 | 48 | mir_tracepoint(mir_client_shared_library_prober, loading_failed, | ||
| 1463 | 49 | filename.string().c_str(), error.what()); | ||
| 1464 | 50 | } | ||
| 1465 | 0 | 51 | ||
| 1466 | === added file 'src/client/lttng/shared_library_prober_report.h' | |||
| 1467 | --- src/client/lttng/shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 1468 | +++ src/client/lttng/shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 1469 | @@ -0,0 +1,55 @@ | |||
| 1470 | 1 | /* | ||
| 1471 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 1472 | 3 | * | ||
| 1473 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 1474 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 1475 | 6 | * published by the Free Software Foundation. | ||
| 1476 | 7 | * | ||
| 1477 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1478 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1479 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1480 | 11 | * GNU Lesser General Public License for more details. | ||
| 1481 | 12 | * | ||
| 1482 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 1483 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1484 | 15 | * | ||
| 1485 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 1486 | 17 | */ | ||
| 1487 | 18 | |||
| 1488 | 19 | #ifndef MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 1489 | 20 | #define MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 1490 | 21 | |||
| 1491 | 22 | #include "mir/shared_library_prober_report.h" | ||
| 1492 | 23 | #include "client_tracepoint_provider.h" | ||
| 1493 | 24 | |||
| 1494 | 25 | namespace mir | ||
| 1495 | 26 | { | ||
| 1496 | 27 | namespace client | ||
| 1497 | 28 | { | ||
| 1498 | 29 | namespace lttng | ||
| 1499 | 30 | { | ||
| 1500 | 31 | |||
| 1501 | 32 | class SharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 1502 | 33 | { | ||
| 1503 | 34 | public: | ||
| 1504 | 35 | void probing_path(boost::filesystem::path const& path) override; | ||
| 1505 | 36 | void probing_failed(boost::filesystem::path const& path, std::exception const& error) override; | ||
| 1506 | 37 | void loading_library(boost::filesystem::path const& filename) override; | ||
| 1507 | 38 | void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override; | ||
| 1508 | 39 | |||
| 1509 | 40 | private: | ||
| 1510 | 41 | ClientTracepointProvider tp_provider; | ||
| 1511 | 42 | }; | ||
| 1512 | 43 | |||
| 1513 | 44 | } | ||
| 1514 | 45 | } | ||
| 1515 | 46 | } | ||
| 1516 | 47 | |||
| 1517 | 48 | #endif /* MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ */ | ||
| 1518 | 49 | |||
| 1519 | 50 | |||
| 1520 | 51 | #ifndef SHARED_LIBRARY_PROBER_REPORT_H | ||
| 1521 | 52 | #define SHARED_LIBRARY_PROBER_REPORT_H | ||
| 1522 | 53 | |||
| 1523 | 54 | |||
| 1524 | 55 | #endif // SHARED_LIBRARY_PROBER_REPORT_H | ||
| 1525 | 0 | 56 | ||
| 1526 | === added file 'src/client/lttng/shared_library_prober_report_tp.h' | |||
| 1527 | --- src/client/lttng/shared_library_prober_report_tp.h 1970-01-01 00:00:00 +0000 | |||
| 1528 | +++ src/client/lttng/shared_library_prober_report_tp.h 2014-08-29 01:18:58 +0000 | |||
| 1529 | @@ -0,0 +1,85 @@ | |||
| 1530 | 1 | /* | ||
| 1531 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 1532 | 3 | * | ||
| 1533 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 1534 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 1535 | 6 | * published by the Free Software Foundation. | ||
| 1536 | 7 | * | ||
| 1537 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1538 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1539 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1540 | 11 | * GNU Lesser General Public License for more details. | ||
| 1541 | 12 | * | ||
| 1542 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 1543 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1544 | 15 | * | ||
| 1545 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 1546 | 17 | */ | ||
| 1547 | 18 | |||
| 1548 | 19 | #undef TRACEPOINT_PROVIDER | ||
| 1549 | 20 | #define TRACEPOINT_PROVIDER mir_client_shared_library_prober | ||
| 1550 | 21 | |||
| 1551 | 22 | #undef TRACEPOINT_INCLUDE | ||
| 1552 | 23 | #define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h" | ||
| 1553 | 24 | |||
| 1554 | 25 | #if !defined(MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ) | ||
| 1555 | 26 | #define MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ | ||
| 1556 | 27 | |||
| 1557 | 28 | #include <lttng/tracepoint.h> | ||
| 1558 | 29 | #include <stdint.h> | ||
| 1559 | 30 | |||
| 1560 | 31 | #ifdef __clang__ | ||
| 1561 | 32 | /* | ||
| 1562 | 33 | * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang | ||
| 1563 | 34 | * these functions are unused and so generate fatal warnings. | ||
| 1564 | 35 | * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974) | ||
| 1565 | 36 | */ | ||
| 1566 | 37 | #pragma clang diagnostic push | ||
| 1567 | 38 | #pragma clang diagnostic warning "-Wunused-function" | ||
| 1568 | 39 | #endif | ||
| 1569 | 40 | |||
| 1570 | 41 | TRACEPOINT_EVENT( | ||
| 1571 | 42 | mir_client_shared_library_prober, | ||
| 1572 | 43 | probing_path, | ||
| 1573 | 44 | TP_ARGS(const char*, path), | ||
| 1574 | 45 | TP_FIELDS( | ||
| 1575 | 46 | ctf_string(path, path) | ||
| 1576 | 47 | ) | ||
| 1577 | 48 | ) | ||
| 1578 | 49 | |||
| 1579 | 50 | TRACEPOINT_EVENT( | ||
| 1580 | 51 | mir_client_shared_library_prober, | ||
| 1581 | 52 | probing_failed, | ||
| 1582 | 53 | TP_ARGS(const char*, path, const char*, message), | ||
| 1583 | 54 | TP_FIELDS( | ||
| 1584 | 55 | ctf_string(path, path) | ||
| 1585 | 56 | ctf_string(message, message) | ||
| 1586 | 57 | ) | ||
| 1587 | 58 | ) | ||
| 1588 | 59 | |||
| 1589 | 60 | TRACEPOINT_EVENT( | ||
| 1590 | 61 | mir_client_shared_library_prober, | ||
| 1591 | 62 | loading_library, | ||
| 1592 | 63 | TP_ARGS(const char*, path), | ||
| 1593 | 64 | TP_FIELDS( | ||
| 1594 | 65 | ctf_string(path, path) | ||
| 1595 | 66 | ) | ||
| 1596 | 67 | ) | ||
| 1597 | 68 | |||
| 1598 | 69 | TRACEPOINT_EVENT( | ||
| 1599 | 70 | mir_client_shared_library_prober, | ||
| 1600 | 71 | loading_failed, | ||
| 1601 | 72 | TP_ARGS(const char*, path, const char*, message), | ||
| 1602 | 73 | TP_FIELDS( | ||
| 1603 | 74 | ctf_string(path, path) | ||
| 1604 | 75 | ctf_string(message, message) | ||
| 1605 | 76 | ) | ||
| 1606 | 77 | ) | ||
| 1607 | 78 | |||
| 1608 | 79 | #ifdef __clang__ | ||
| 1609 | 80 | #pragma clang diagnostic pop | ||
| 1610 | 81 | #endif | ||
| 1611 | 82 | |||
| 1612 | 83 | #endif /* MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */ | ||
| 1613 | 84 | |||
| 1614 | 85 | #include <lttng/tracepoint-event.h> | ||
| 1615 | 0 | 86 | ||
| 1616 | === modified file 'src/client/mesa/CMakeLists.txt' | |||
| 1617 | --- src/client/mesa/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 1618 | +++ src/client/mesa/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 1619 | @@ -17,7 +17,7 @@ | |||
| 1620 | 17 | ) | 17 | ) |
| 1621 | 18 | 18 | ||
| 1622 | 19 | add_library( | 19 | add_library( |
| 1624 | 20 | mirclientplatformmesa SHARED | 20 | mirclientplatformmesa MODULE |
| 1625 | 21 | 21 | ||
| 1626 | 22 | $<TARGET_OBJECTS:mirclientplatformmesaobjects> | 22 | $<TARGET_OBJECTS:mirclientplatformmesaobjects> |
| 1627 | 23 | $<TARGET_OBJECTS:mirclient_platformimpl> | 23 | $<TARGET_OBJECTS:mirclient_platformimpl> |
| 1628 | @@ -25,9 +25,9 @@ | |||
| 1629 | 25 | 25 | ||
| 1630 | 26 | set_target_properties( | 26 | set_target_properties( |
| 1631 | 27 | mirclientplatformmesa PROPERTIES | 27 | mirclientplatformmesa PROPERTIES |
| 1635 | 28 | OUTPUT_NAME mirclientplatform | 28 | OUTPUT_NAME client-platform-mesa |
| 1636 | 29 | LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa | 29 | PREFIX "" |
| 1637 | 30 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | 30 | LINK_FLAGS "-Wl,--version-script,${symbol_map}" |
| 1638 | 31 | ) | 31 | ) |
| 1639 | 32 | 32 | ||
| 1640 | 33 | target_link_libraries( | 33 | target_link_libraries( |
| 1641 | @@ -36,21 +36,4 @@ | |||
| 1642 | 36 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | 36 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} |
| 1643 | 37 | ) | 37 | ) |
| 1644 | 38 | 38 | ||
| 1663 | 39 | install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa) | 39 | install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH}) |
| 1646 | 40 | |||
| 1647 | 41 | if (MIR_TEST_PLATFORM STREQUAL "mesa") | ||
| 1648 | 42 | add_custom_command(TARGET mirclientplatformmesa | ||
| 1649 | 43 | POST_BUILD | ||
| 1650 | 44 | COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so | ||
| 1651 | 45 | COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so | ||
| 1652 | 46 | WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} | ||
| 1653 | 47 | ) | ||
| 1654 | 48 | |||
| 1655 | 49 | install(CODE | ||
| 1656 | 50 | "execute_process( | ||
| 1657 | 51 | COMMAND ln -sf mir/clientplatform/mesa/libmirclientplatform.so | ||
| 1658 | 52 | WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} | ||
| 1659 | 53 | )" | ||
| 1660 | 54 | ) | ||
| 1661 | 55 | endif() | ||
| 1662 | 56 | |||
| 1664 | 57 | 40 | ||
| 1665 | === modified file 'src/client/mesa/client_platform.cpp' | |||
| 1666 | --- src/client/mesa/client_platform.cpp 2014-03-06 06:05:17 +0000 | |||
| 1667 | +++ src/client/mesa/client_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 1668 | @@ -95,7 +95,7 @@ | |||
| 1669 | 95 | std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display() | 95 | std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display() |
| 1670 | 96 | { | 96 | { |
| 1671 | 97 | MirEGLNativeDisplayType *mir_native_display = new MirEGLNativeDisplayType; | 97 | MirEGLNativeDisplayType *mir_native_display = new MirEGLNativeDisplayType; |
| 1673 | 98 | *mir_native_display = display_container.create(context->mir_connection()); | 98 | *mir_native_display = display_container.create(context); |
| 1674 | 99 | auto egl_native_display = reinterpret_cast<EGLNativeDisplayType*>(mir_native_display); | 99 | auto egl_native_display = reinterpret_cast<EGLNativeDisplayType*>(mir_native_display); |
| 1675 | 100 | 100 | ||
| 1676 | 101 | return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container)); | 101 | return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container)); |
| 1677 | 102 | 102 | ||
| 1678 | === modified file 'src/client/mesa/client_platform_factory.cpp' | |||
| 1679 | --- src/client/mesa/client_platform_factory.cpp 2014-02-07 15:43:41 +0000 | |||
| 1680 | +++ src/client/mesa/client_platform_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 1681 | @@ -16,13 +16,16 @@ | |||
| 1682 | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> | 16 | * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com> |
| 1683 | 17 | */ | 17 | */ |
| 1684 | 18 | 18 | ||
| 1686 | 19 | #include "client_platform_factory.h" | 19 | #include "../client_platform_factory.h" |
| 1687 | 20 | #include "client_platform.h" | 20 | #include "client_platform.h" |
| 1688 | 21 | #include "mir_toolkit/client_types.h" | ||
| 1689 | 22 | #include "../client_context.h" | ||
| 1690 | 21 | #include "buffer_file_ops.h" | 23 | #include "buffer_file_ops.h" |
| 1691 | 22 | #include "../egl_native_display_container.h" | 24 | #include "../egl_native_display_container.h" |
| 1692 | 23 | 25 | ||
| 1693 | 24 | #include <sys/mman.h> | 26 | #include <sys/mman.h> |
| 1694 | 25 | #include <unistd.h> | 27 | #include <unistd.h> |
| 1695 | 28 | #include <stdexcept> | ||
| 1696 | 26 | 29 | ||
| 1697 | 27 | namespace mcl = mir::client; | 30 | namespace mcl = mir::client; |
| 1698 | 28 | namespace mclm = mcl::mesa; | 31 | namespace mclm = mcl::mesa; |
| 1699 | @@ -57,15 +60,26 @@ | |||
| 1700 | 57 | 60 | ||
| 1701 | 58 | } | 61 | } |
| 1702 | 59 | 62 | ||
| 1705 | 60 | std::shared_ptr<mcl::ClientPlatform> | 63 | extern "C" std::shared_ptr<mcl::ClientPlatform> mcl::create_client_platform(mcl::ClientContext* context) |
| 1704 | 61 | mclm::ClientPlatformFactory::create_client_platform(mcl::ClientContext* context) | ||
| 1706 | 62 | { | 64 | { |
| 1708 | 63 | auto buffer_file_ops = std::make_shared<RealBufferFileOps>(); | 65 | MirPlatformPackage package; |
| 1709 | 66 | context->populate(package); | ||
| 1710 | 67 | if (package.data_items != 0 || package.fd_items != 1) | ||
| 1711 | 68 | { | ||
| 1712 | 69 | throw std::runtime_error{"Attempted to create Mesa client platform on non-Mesa server"}; | ||
| 1713 | 70 | } | ||
| 1714 | 71 | ; auto buffer_file_ops = std::make_shared<RealBufferFileOps>(); | ||
| 1715 | 64 | return std::make_shared<mclm::ClientPlatform>( | 72 | return std::make_shared<mclm::ClientPlatform>( |
| 1716 | 65 | context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance()); | 73 | context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance()); |
| 1717 | 66 | } | 74 | } |
| 1718 | 67 | 75 | ||
| 1720 | 68 | extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory() | 76 | extern "C" bool |
| 1721 | 77 | mcl::is_appropriate_module(mcl::ClientContext* context) | ||
| 1722 | 69 | { | 78 | { |
| 1724 | 70 | return std::make_shared<mclm::ClientPlatformFactory>(); | 79 | MirPlatformPackage platform; |
| 1725 | 80 | context->populate(platform); | ||
| 1726 | 81 | // TODO: Actually check what platform we're using, rather than blindly | ||
| 1727 | 82 | // hope we can distinguish them from the stuff they've put in the | ||
| 1728 | 83 | // PlatformPackage. | ||
| 1729 | 84 | return platform.data_items == 0 && platform.fd_items == 1; | ||
| 1730 | 71 | } | 85 | } |
| 1731 | 72 | 86 | ||
| 1732 | === modified file 'src/client/mesa/client_platform_factory.h' | |||
| 1733 | --- src/client/mesa/client_platform_factory.h 2014-02-07 15:43:41 +0000 | |||
| 1734 | +++ src/client/mesa/client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 1735 | @@ -28,11 +28,6 @@ | |||
| 1736 | 28 | namespace mesa | 28 | namespace mesa |
| 1737 | 29 | { | 29 | { |
| 1738 | 30 | 30 | ||
| 1739 | 31 | class ClientPlatformFactory : public client::ClientPlatformFactory | ||
| 1740 | 32 | { | ||
| 1741 | 33 | public: | ||
| 1742 | 34 | std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override; | ||
| 1743 | 35 | }; | ||
| 1744 | 36 | 31 | ||
| 1745 | 37 | } | 32 | } |
| 1746 | 38 | } | 33 | } |
| 1747 | 39 | 34 | ||
| 1748 | === modified file 'src/client/mesa/mesa_native_display_container.cpp' | |||
| 1749 | --- src/client/mesa/mesa_native_display_container.cpp 2014-07-17 12:32:21 +0000 | |||
| 1750 | +++ src/client/mesa/mesa_native_display_container.cpp 2014-08-29 01:18:58 +0000 | |||
| 1751 | @@ -18,7 +18,7 @@ | |||
| 1752 | 18 | 18 | ||
| 1753 | 19 | #include "mesa_native_display_container.h" | 19 | #include "mesa_native_display_container.h" |
| 1754 | 20 | 20 | ||
| 1756 | 21 | #include "mir_toolkit/mir_client_library.h" | 21 | #include "../client_context.h" |
| 1757 | 22 | 22 | ||
| 1758 | 23 | #include <cstring> | 23 | #include <cstring> |
| 1759 | 24 | #include <unordered_set> | 24 | #include <unordered_set> |
| 1760 | @@ -35,8 +35,8 @@ | |||
| 1761 | 35 | static int egl_display_get_platform(MirMesaEGLNativeDisplay* display, | 35 | static int egl_display_get_platform(MirMesaEGLNativeDisplay* display, |
| 1762 | 36 | MirPlatformPackage* package) | 36 | MirPlatformPackage* package) |
| 1763 | 37 | { | 37 | { |
| 1766 | 38 | auto connection = static_cast<MirConnection*>(display->context); | 38 | auto context = static_cast<mcl::ClientContext*>(display->context); |
| 1767 | 39 | mir_connection_get_platform(connection, package); | 39 | context->populate(*package); |
| 1768 | 40 | return MIR_MESA_TRUE; | 40 | return MIR_MESA_TRUE; |
| 1769 | 41 | } | 41 | } |
| 1770 | 42 | 42 | ||
| 1771 | @@ -93,11 +93,11 @@ | |||
| 1772 | 93 | } | 93 | } |
| 1773 | 94 | 94 | ||
| 1774 | 95 | MirEGLNativeDisplayType | 95 | MirEGLNativeDisplayType |
| 1776 | 96 | mclm::MesaNativeDisplayContainer::create(MirConnection* connection) | 96 | mclm::MesaNativeDisplayContainer::create(ClientContext* context) |
| 1777 | 97 | { | 97 | { |
| 1778 | 98 | MirMesaEGLNativeDisplay* display = new MirMesaEGLNativeDisplay(); | 98 | MirMesaEGLNativeDisplay* display = new MirMesaEGLNativeDisplay(); |
| 1779 | 99 | display->display_get_platform = egl_display_get_platform; | 99 | display->display_get_platform = egl_display_get_platform; |
| 1781 | 100 | display->context = connection; | 100 | display->context = context; |
| 1782 | 101 | 101 | ||
| 1783 | 102 | std::lock_guard<std::mutex> lg(guard); | 102 | std::lock_guard<std::mutex> lg(guard); |
| 1784 | 103 | auto egl_display = static_cast<MirEGLNativeDisplayType>(display); | 103 | auto egl_display = static_cast<MirEGLNativeDisplayType>(display); |
| 1785 | 104 | 104 | ||
| 1786 | === modified file 'src/client/mesa/mesa_native_display_container.h' | |||
| 1787 | --- src/client/mesa/mesa_native_display_container.h 2014-03-06 06:05:17 +0000 | |||
| 1788 | +++ src/client/mesa/mesa_native_display_container.h 2014-08-29 01:18:58 +0000 | |||
| 1789 | @@ -40,7 +40,7 @@ | |||
| 1790 | 40 | MesaNativeDisplayContainer(); | 40 | MesaNativeDisplayContainer(); |
| 1791 | 41 | virtual ~MesaNativeDisplayContainer(); | 41 | virtual ~MesaNativeDisplayContainer(); |
| 1792 | 42 | 42 | ||
| 1794 | 43 | MirEGLNativeDisplayType create(MirConnection* connection); | 43 | MirEGLNativeDisplayType create(ClientContext* context); |
| 1795 | 44 | void release(MirEGLNativeDisplayType display); | 44 | void release(MirEGLNativeDisplayType display); |
| 1796 | 45 | 45 | ||
| 1797 | 46 | bool validate(MirEGLNativeDisplayType display) const; | 46 | bool validate(MirEGLNativeDisplayType display) const; |
| 1798 | 47 | 47 | ||
| 1799 | === modified file 'src/client/mesa/native_surface.cpp' | |||
| 1800 | --- src/client/mesa/native_surface.cpp 2014-08-05 07:09:05 +0000 | |||
| 1801 | +++ src/client/mesa/native_surface.cpp 2014-08-29 01:18:58 +0000 | |||
| 1802 | @@ -20,7 +20,6 @@ | |||
| 1803 | 20 | #include "../client_buffer.h" | 20 | #include "../client_buffer.h" |
| 1804 | 21 | #include "native_surface.h" | 21 | #include "native_surface.h" |
| 1805 | 22 | 22 | ||
| 1806 | 23 | #include <iostream> | ||
| 1807 | 24 | #include <boost/exception/diagnostic_information.hpp> | 23 | #include <boost/exception/diagnostic_information.hpp> |
| 1808 | 25 | 24 | ||
| 1809 | 26 | namespace mclm=mir::client::mesa; | 25 | namespace mclm=mir::client::mesa; |
| 1810 | 27 | 26 | ||
| 1811 | === modified file 'src/client/mesa/symbols.map' | |||
| 1812 | --- src/client/mesa/symbols.map 2014-08-25 03:11:01 +0000 | |||
| 1813 | +++ src/client/mesa/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 1814 | @@ -1,7 +1,9 @@ | |||
| 1815 | 1 | MIR_CLIENTPLATFORM_1 { | 1 | MIR_CLIENTPLATFORM_1 { |
| 1816 | 2 | global: | 2 | global: |
| 1818 | 3 | create_client_platform_factory; | 3 | create_client_platform; |
| 1819 | 4 | is_appropriate_module; | ||
| 1820 | 4 | # Needed by our Mesa EGL platform | 5 | # Needed by our Mesa EGL platform |
| 1821 | 5 | mir_client_mesa_egl_native_display_is_valid; | 6 | mir_client_mesa_egl_native_display_is_valid; |
| 1823 | 6 | local: *; | 7 | local: |
| 1824 | 8 | *; | ||
| 1825 | 7 | }; | 9 | }; |
| 1826 | 8 | 10 | ||
| 1827 | === modified file 'src/client/mir_connection.cpp' | |||
| 1828 | --- src/client/mir_connection.cpp 2014-08-26 13:38:23 +0000 | |||
| 1829 | +++ src/client/mir_connection.cpp 2014-08-29 01:18:58 +0000 | |||
| 1830 | @@ -98,6 +98,7 @@ | |||
| 1831 | 98 | channel(conf.the_rpc_channel()), | 98 | channel(conf.the_rpc_channel()), |
| 1832 | 99 | server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL), | 99 | server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL), |
| 1833 | 100 | logger(conf.the_logger()), | 100 | logger(conf.the_logger()), |
| 1834 | 101 | connect_done{false}, | ||
| 1835 | 101 | client_platform_factory(conf.the_client_platform_factory()), | 102 | client_platform_factory(conf.the_client_platform_factory()), |
| 1836 | 102 | input_platform(conf.the_input_platform()), | 103 | input_platform(conf.the_input_platform()), |
| 1837 | 103 | display_configuration(conf.the_display_configuration()), | 104 | display_configuration(conf.the_display_configuration()), |
| 1838 | @@ -249,6 +250,9 @@ | |||
| 1839 | 249 | set_error_message("Connect failed"); | 250 | set_error_message("Connect failed"); |
| 1840 | 250 | } | 251 | } |
| 1841 | 251 | } | 252 | } |
| 1842 | 253 | |||
| 1843 | 254 | connect_done = true; | ||
| 1844 | 255 | |||
| 1845 | 252 | /* | 256 | /* |
| 1846 | 253 | * We need to create the client platform after the connection has been | 257 | * We need to create the client platform after the connection has been |
| 1847 | 254 | * established, to ensure that the client platform has access to all | 258 | * established, to ensure that the client platform has access to all |
| 1848 | @@ -353,9 +357,9 @@ | |||
| 1849 | 353 | 357 | ||
| 1850 | 354 | void MirConnection::populate(MirPlatformPackage& platform_package) | 358 | void MirConnection::populate(MirPlatformPackage& platform_package) |
| 1851 | 355 | { | 359 | { |
| 1855 | 356 | std::lock_guard<decltype(mutex)> lock(mutex); | 360 | // connect_result is write-once: once it's valid, we don't need to lock |
| 1856 | 357 | 361 | // to use it. | |
| 1857 | 358 | if (!connect_result.has_error() && connect_result.has_platform()) | 362 | if (connect_done && !connect_result.has_error() && connect_result.has_platform()) |
| 1858 | 359 | { | 363 | { |
| 1859 | 360 | auto const& platform = connect_result.platform(); | 364 | auto const& platform = connect_result.platform(); |
| 1860 | 361 | 365 | ||
| 1861 | 362 | 366 | ||
| 1862 | === modified file 'src/client/mir_connection.h' | |||
| 1863 | --- src/client/mir_connection.h 2014-08-26 13:38:23 +0000 | |||
| 1864 | +++ src/client/mir_connection.h 2014-08-29 01:18:58 +0000 | |||
| 1865 | @@ -22,6 +22,7 @@ | |||
| 1866 | 22 | #include <memory> | 22 | #include <memory> |
| 1867 | 23 | #include <unordered_set> | 23 | #include <unordered_set> |
| 1868 | 24 | #include <unordered_map> | 24 | #include <unordered_map> |
| 1869 | 25 | #include <atomic> | ||
| 1870 | 25 | 26 | ||
| 1871 | 26 | #include <mutex> | 27 | #include <mutex> |
| 1872 | 27 | 28 | ||
| 1873 | @@ -149,8 +150,9 @@ | |||
| 1874 | 149 | std::shared_ptr<google::protobuf::RpcChannel> const channel; | 150 | std::shared_ptr<google::protobuf::RpcChannel> const channel; |
| 1875 | 150 | mir::protobuf::DisplayServer::Stub server; | 151 | mir::protobuf::DisplayServer::Stub server; |
| 1876 | 151 | std::shared_ptr<mir::logging::Logger> const logger; | 152 | std::shared_ptr<mir::logging::Logger> const logger; |
| 1878 | 152 | mir::protobuf::Void void_response; | 153 | mir::protobuf::Void void_response; |
| 1879 | 153 | mir::protobuf::Connection connect_result; | 154 | mir::protobuf::Connection connect_result; |
| 1880 | 155 | std::atomic<bool> connect_done; | ||
| 1881 | 154 | mir::protobuf::Void ignored; | 156 | mir::protobuf::Void ignored; |
| 1882 | 155 | mir::protobuf::ConnectParameters connect_parameters; | 157 | mir::protobuf::ConnectParameters connect_parameters; |
| 1883 | 156 | mir::protobuf::DRMAuthMagicStatus drm_auth_magic_status; | 158 | mir::protobuf::DRMAuthMagicStatus drm_auth_magic_status; |
| 1884 | 157 | 159 | ||
| 1885 | === added file 'src/client/probing_client_platform_factory.cpp' | |||
| 1886 | --- src/client/probing_client_platform_factory.cpp 1970-01-01 00:00:00 +0000 | |||
| 1887 | +++ src/client/probing_client_platform_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 1888 | @@ -0,0 +1,29 @@ | |||
| 1889 | 1 | #include "probing_client_platform_factory.h" | ||
| 1890 | 2 | |||
| 1891 | 3 | #include <stdexcept> | ||
| 1892 | 4 | |||
| 1893 | 5 | namespace mcl = mir::client; | ||
| 1894 | 6 | |||
| 1895 | 7 | mcl::ProbingClientPlatformFactory::ProbingClientPlatformFactory(std::vector<std::shared_ptr<mir::SharedLibrary>> const& modules) | ||
| 1896 | 8 | : platform_modules{modules} | ||
| 1897 | 9 | { | ||
| 1898 | 10 | if (modules.empty()) | ||
| 1899 | 11 | { | ||
| 1900 | 12 | throw std::runtime_error{"Attempted to create a ClientPlatformFactory with no platform modules"}; | ||
| 1901 | 13 | } | ||
| 1902 | 14 | } | ||
| 1903 | 15 | |||
| 1904 | 16 | std::shared_ptr<mcl::ClientPlatform> | ||
| 1905 | 17 | mcl::ProbingClientPlatformFactory::create_client_platform(mcl::ClientContext* context) | ||
| 1906 | 18 | { | ||
| 1907 | 19 | for (auto& module : platform_modules) | ||
| 1908 | 20 | { | ||
| 1909 | 21 | auto probe = module->load_function<mir::client::ClientPlatformProbe>("is_appropriate_module"); | ||
| 1910 | 22 | if (probe(context)) | ||
| 1911 | 23 | { | ||
| 1912 | 24 | auto factory = module->load_function<mir::client::CreateClientPlatform>("create_client_platform"); | ||
| 1913 | 25 | return factory(context); | ||
| 1914 | 26 | } | ||
| 1915 | 27 | } | ||
| 1916 | 28 | throw std::runtime_error{"No appropriate client platform module found"}; | ||
| 1917 | 29 | } | ||
| 1918 | 0 | 30 | ||
| 1919 | === added file 'src/client/probing_client_platform_factory.h' | |||
| 1920 | --- src/client/probing_client_platform_factory.h 1970-01-01 00:00:00 +0000 | |||
| 1921 | +++ src/client/probing_client_platform_factory.h 2014-08-29 01:18:58 +0000 | |||
| 1922 | @@ -0,0 +1,27 @@ | |||
| 1923 | 1 | #ifndef MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_ | ||
| 1924 | 2 | #define MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_ | ||
| 1925 | 3 | |||
| 1926 | 4 | #include <vector> | ||
| 1927 | 5 | |||
| 1928 | 6 | #include "client_platform_factory.h" | ||
| 1929 | 7 | #include "mir/shared_library.h" | ||
| 1930 | 8 | |||
| 1931 | 9 | namespace mir | ||
| 1932 | 10 | { | ||
| 1933 | 11 | namespace client | ||
| 1934 | 12 | { | ||
| 1935 | 13 | class ProbingClientPlatformFactory : public ClientPlatformFactory | ||
| 1936 | 14 | { | ||
| 1937 | 15 | public: | ||
| 1938 | 16 | ProbingClientPlatformFactory(std::vector<std::shared_ptr<SharedLibrary>> const& modules); | ||
| 1939 | 17 | |||
| 1940 | 18 | std::shared_ptr<ClientPlatform> create_client_platform(ClientContext *context) override; | ||
| 1941 | 19 | private: | ||
| 1942 | 20 | std::vector<std::shared_ptr<SharedLibrary>> platform_modules; | ||
| 1943 | 21 | }; | ||
| 1944 | 22 | |||
| 1945 | 23 | |||
| 1946 | 24 | } | ||
| 1947 | 25 | } | ||
| 1948 | 26 | |||
| 1949 | 27 | #endif // MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_ | ||
| 1950 | 0 | 28 | ||
| 1951 | === modified file 'src/platform/CMakeLists.txt' | |||
| 1952 | --- src/platform/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 1953 | +++ src/platform/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 1954 | @@ -4,12 +4,21 @@ | |||
| 1955 | 4 | 4 | ||
| 1956 | 5 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) | 5 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) |
| 1957 | 6 | 6 | ||
| 1961 | 7 | add_library(mirplatformobjects OBJECT | 7 | # This needs to change whenever the much smaller ABI between the platform |
| 1962 | 8 | shared_library_loader.cpp | 8 | # modules and the server changes in an incompatible way. |
| 1963 | 9 | ) | 9 | set(MIR_PLATFORM_PLUGIN_ABI 1) |
| 1964 | 10 | |||
| 1965 | 11 | set(MIR_SERVER_PLATFORM_PLUGIN_PATH | ||
| 1966 | 12 | ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform-${MIR_PLATFORM_PLUGIN_ABI} | ||
| 1967 | 13 | ) | ||
| 1968 | 14 | set(MIR_SERVER_PLATFORM_PLUGIN_PATH | ||
| 1969 | 15 | ${MIR_SERVER_PLATFORM_PLUGIN_PATH} | ||
| 1970 | 16 | PARENT_SCOPE | ||
| 1971 | 17 | ) | ||
| 1972 | 18 | |||
| 1973 | 19 | add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}") | ||
| 1974 | 10 | 20 | ||
| 1975 | 11 | set(MIR_PLATFORM_OBJECTS | 21 | set(MIR_PLATFORM_OBJECTS |
| 1976 | 12 | $<TARGET_OBJECTS:mirplatformobjects> | ||
| 1977 | 13 | $<TARGET_OBJECTS:mirplatformgraphicscommon> | 22 | $<TARGET_OBJECTS:mirplatformgraphicscommon> |
| 1978 | 14 | $<TARGET_OBJECTS:miroptions> | 23 | $<TARGET_OBJECTS:miroptions> |
| 1979 | 15 | $<TARGET_OBJECTS:mirfatal> | 24 | $<TARGET_OBJECTS:mirfatal> |
| 1980 | @@ -28,17 +37,19 @@ | |||
| 1981 | 28 | ) | 37 | ) |
| 1982 | 29 | 38 | ||
| 1983 | 30 | target_link_libraries(mirplatform | 39 | target_link_libraries(mirplatform |
| 1984 | 40 | |||
| 1985 | 31 | mircommon | 41 | mircommon |
| 1986 | 32 | ${MIR_PLATFORM_REFERENCES} | 42 | ${MIR_PLATFORM_REFERENCES} |
| 1987 | 33 | ) | 43 | ) |
| 1988 | 34 | 44 | ||
| 1990 | 35 | set_target_properties(mirplatform | 45 | set_target_properties( |
| 1991 | 46 | mirplatform | ||
| 1992 | 47 | |||
| 1993 | 36 | PROPERTIES | 48 | PROPERTIES |
| 1994 | 37 | SOVERSION ${MIRPLATFORM_ABI} | 49 | SOVERSION ${MIRPLATFORM_ABI} |
| 1995 | 38 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | 50 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" |
| 1996 | 39 | ) | 51 | ) |
| 1997 | 40 | 52 | ||
| 1998 | 41 | |||
| 1999 | 42 | install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 53 | install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 2000 | 43 | 54 | ||
| 2001 | 44 | add_subdirectory(graphics/) | 55 | add_subdirectory(graphics/) |
| 2002 | 45 | 56 | ||
| 2003 | === modified file 'src/platform/graphics/CMakeLists.txt' | |||
| 2004 | --- src/platform/graphics/CMakeLists.txt 2014-08-04 08:58:40 +0000 | |||
| 2005 | +++ src/platform/graphics/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2006 | @@ -14,6 +14,7 @@ | |||
| 2007 | 14 | gl_program.cpp | 14 | gl_program.cpp |
| 2008 | 15 | gl_texture.cpp | 15 | gl_texture.cpp |
| 2009 | 16 | tessellation_helpers.cpp | 16 | tessellation_helpers.cpp |
| 2010 | 17 | platform_probe.cpp | ||
| 2011 | 17 | ) | 18 | ) |
| 2012 | 18 | 19 | ||
| 2013 | 19 | add_library(mirplatformgraphicscommon OBJECT | 20 | add_library(mirplatformgraphicscommon OBJECT |
| 2014 | 20 | 21 | ||
| 2015 | === modified file 'src/platform/graphics/android/CMakeLists.txt' | |||
| 2016 | --- src/platform/graphics/android/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 2017 | +++ src/platform/graphics/android/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2018 | @@ -8,7 +8,9 @@ | |||
| 2019 | 8 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") | 8 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") |
| 2020 | 9 | add_definitions( -DANDROID ) | 9 | add_definitions( -DANDROID ) |
| 2021 | 10 | 10 | ||
| 2023 | 11 | add_library(mirplatformgraphicsandroidobjects OBJECT | 11 | add_library( |
| 2024 | 12 | mirplatformgraphicsandroidobjects OBJECT | ||
| 2025 | 13 | |||
| 2026 | 12 | android_platform.cpp | 14 | android_platform.cpp |
| 2027 | 13 | android_buffer_allocator.cpp | 15 | android_buffer_allocator.cpp |
| 2028 | 14 | buffer.cpp | 16 | buffer.cpp |
| 2029 | @@ -36,17 +38,12 @@ | |||
| 2030 | 36 | real_hwc_wrapper.cpp | 38 | real_hwc_wrapper.cpp |
| 2031 | 37 | hwc_fallback_gl_renderer.cpp | 39 | hwc_fallback_gl_renderer.cpp |
| 2032 | 38 | ) | 40 | ) |
| 2033 | 41 | |||
| 2034 | 39 | add_library(mirplatformgraphicsandroid SHARED | 42 | add_library(mirplatformgraphicsandroid SHARED |
| 2035 | 43 | |||
| 2036 | 40 | $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects> | 44 | $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects> |
| 2037 | 41 | ) | 45 | ) |
| 2038 | 42 | 46 | ||
| 2039 | 43 | set_target_properties( | ||
| 2040 | 44 | mirplatformgraphicsandroid PROPERTIES | ||
| 2041 | 45 | OUTPUT_NAME mirplatformgraphics | ||
| 2042 | 46 | LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android | ||
| 2043 | 47 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | ||
| 2044 | 48 | ) | ||
| 2045 | 49 | |||
| 2046 | 50 | target_link_libraries( | 47 | target_link_libraries( |
| 2047 | 51 | mirplatformgraphicsandroid | 48 | mirplatformgraphicsandroid |
| 2048 | 52 | 49 | ||
| 2049 | @@ -59,20 +56,13 @@ | |||
| 2050 | 59 | ${ANDROID_PROPERTIES_LDFLAGS} | 56 | ${ANDROID_PROPERTIES_LDFLAGS} |
| 2051 | 60 | ) | 57 | ) |
| 2052 | 61 | 58 | ||
| 2070 | 62 | install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android) | 59 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) |
| 2071 | 63 | 60 | ||
| 2072 | 64 | if (MIR_TEST_PLATFORM STREQUAL "android") | 61 | set_target_properties( |
| 2073 | 65 | add_custom_command(TARGET mirplatformgraphicsandroid | 62 | mirplatformgraphicsandroid PROPERTIES |
| 2074 | 66 | POST_BUILD | 63 | OUTPUT_NAME platform-graphics-android |
| 2075 | 67 | COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so | 64 | PREFIX "" |
| 2076 | 68 | COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so | 65 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" |
| 2077 | 69 | WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} | 66 | ) |
| 2078 | 70 | ) | 67 | |
| 2079 | 71 | 68 | install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH}) | |
| 2063 | 72 | install(CODE | ||
| 2064 | 73 | "execute_process( | ||
| 2065 | 74 | COMMAND ln -sf mir/platformgraphics/android/libmirplatformgraphics.so | ||
| 2066 | 75 | WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} | ||
| 2067 | 76 | )" | ||
| 2068 | 77 | ) | ||
| 2069 | 78 | endif() | ||
| 2080 | 79 | 69 | ||
| 2081 | === modified file 'src/platform/graphics/android/android_platform.cpp' | |||
| 2082 | --- src/platform/graphics/android/android_platform.cpp 2014-08-07 13:22:53 +0000 | |||
| 2083 | +++ src/platform/graphics/android/android_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 2084 | @@ -187,3 +187,26 @@ | |||
| 2085 | 187 | boost::program_options::value<bool>()->default_value(true), //TODO: switch default to false | 187 | boost::program_options::value<bool>()->default_value(true), //TODO: switch default to false |
| 2086 | 188 | "[platform-specific] Whether to disable overlay optimizations [{on,off}]"); | 188 | "[platform-specific] Whether to disable overlay optimizations [{on,off}]"); |
| 2087 | 189 | } | 189 | } |
| 2088 | 190 | |||
| 2089 | 191 | extern "C" mg::PlatformPriority probe_platform() | ||
| 2090 | 192 | { | ||
| 2091 | 193 | int err; | ||
| 2092 | 194 | hw_module_t const* hw_module; | ||
| 2093 | 195 | |||
| 2094 | 196 | err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hw_module); | ||
| 2095 | 197 | |||
| 2096 | 198 | // TODO: Yo! kdub! Is this totally insane? | ||
| 2097 | 199 | // It *looks* like the hw_module_t is global, so we don't leak by | ||
| 2098 | 200 | // not doing anything with it? | ||
| 2099 | 201 | |||
| 2100 | 202 | return err < 0 ? mg::PlatformPriority::unsupported : mg::PlatformPriority::best; | ||
| 2101 | 203 | } | ||
| 2102 | 204 | |||
| 2103 | 205 | mg::ModuleProperties const description = { | ||
| 2104 | 206 | "android" | ||
| 2105 | 207 | }; | ||
| 2106 | 208 | |||
| 2107 | 209 | extern "C" mg::ModuleProperties const* describe_module() | ||
| 2108 | 210 | { | ||
| 2109 | 211 | return &description; | ||
| 2110 | 212 | } | ||
| 2111 | 190 | 213 | ||
| 2112 | === added file 'src/platform/graphics/android/symbols.map' | |||
| 2113 | --- src/platform/graphics/android/symbols.map 1970-01-01 00:00:00 +0000 | |||
| 2114 | +++ src/platform/graphics/android/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 2115 | @@ -0,0 +1,8 @@ | |||
| 2116 | 1 | MIR_GRAPHICS_PLATFORM_1 { | ||
| 2117 | 2 | global: | ||
| 2118 | 3 | add_platform_options; | ||
| 2119 | 4 | create_platform; | ||
| 2120 | 5 | create_native_platform; | ||
| 2121 | 6 | probe_platform; | ||
| 2122 | 7 | describe_module; | ||
| 2123 | 8 | }; | ||
| 2124 | 0 | 9 | ||
| 2125 | === modified file 'src/platform/graphics/mesa/CMakeLists.txt' | |||
| 2126 | --- src/platform/graphics/mesa/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 2127 | +++ src/platform/graphics/mesa/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2128 | @@ -11,7 +11,9 @@ | |||
| 2129 | 11 | string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) | 11 | string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) |
| 2130 | 12 | add_definitions(-D__GBM__) | 12 | add_definitions(-D__GBM__) |
| 2131 | 13 | 13 | ||
| 2133 | 14 | add_library(mirplatformgraphicsmesaobjects OBJECT | 14 | add_library( |
| 2134 | 15 | mirplatformgraphicsmesaobjects OBJECT | ||
| 2135 | 16 | |||
| 2136 | 15 | platform.cpp | 17 | platform.cpp |
| 2137 | 16 | buffer_allocator.cpp | 18 | buffer_allocator.cpp |
| 2138 | 17 | gbm_buffer.cpp | 19 | gbm_buffer.cpp |
| 2139 | @@ -35,18 +37,14 @@ | |||
| 2140 | 35 | bypass.cpp | 37 | bypass.cpp |
| 2141 | 36 | ) | 38 | ) |
| 2142 | 37 | 39 | ||
| 2144 | 38 | add_library(mirplatformgraphicsmesa SHARED | 40 | add_library( |
| 2145 | 41 | mirplatformgraphicsmesa MODULE | ||
| 2146 | 42 | |||
| 2147 | 39 | $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects> | 43 | $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects> |
| 2148 | 40 | ) | 44 | ) |
| 2149 | 41 | 45 | ||
| 2158 | 42 | set_target_properties( | 46 | target_link_libraries( |
| 2159 | 43 | mirplatformgraphicsmesa PROPERTIES | 47 | mirplatformgraphicsmesa |
| 2152 | 44 | OUTPUT_NAME mirplatformgraphics | ||
| 2153 | 45 | LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa | ||
| 2154 | 46 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" | ||
| 2155 | 47 | ) | ||
| 2156 | 48 | |||
| 2157 | 49 | target_link_libraries(mirplatformgraphicsmesa | ||
| 2160 | 50 | 48 | ||
| 2161 | 51 | ${Boost_PROGRAM_OPTIONS_LIBRARY} | 49 | ${Boost_PROGRAM_OPTIONS_LIBRARY} |
| 2162 | 52 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | 50 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} |
| 2163 | @@ -55,20 +53,13 @@ | |||
| 2164 | 55 | ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES} | 53 | ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES} |
| 2165 | 56 | ) | 54 | ) |
| 2166 | 57 | 55 | ||
| 2184 | 58 | install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa) | 56 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) |
| 2185 | 59 | 57 | ||
| 2186 | 60 | if (MIR_TEST_PLATFORM STREQUAL "mesa") | 58 | set_target_properties( |
| 2187 | 61 | add_custom_command(TARGET mirplatformgraphicsmesa | 59 | mirplatformgraphicsmesa PROPERTIES |
| 2188 | 62 | POST_BUILD | 60 | OUTPUT_NAME platform-graphics-mesa |
| 2189 | 63 | COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so | 61 | PREFIX "" |
| 2190 | 64 | COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so | 62 | LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}" |
| 2191 | 65 | WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} | 63 | ) |
| 2192 | 66 | ) | 64 | |
| 2193 | 67 | 65 | install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH}) | |
| 2177 | 68 | install(CODE | ||
| 2178 | 69 | "execute_process( | ||
| 2179 | 70 | COMMAND ln -sf mir/platformgraphics/mesa/libmirplatformgraphics.so | ||
| 2180 | 71 | WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} | ||
| 2181 | 72 | )" | ||
| 2182 | 73 | ) | ||
| 2183 | 74 | endif() | ||
| 2194 | 75 | 66 | ||
| 2195 | === modified file 'src/platform/graphics/mesa/platform.cpp' | |||
| 2196 | --- src/platform/graphics/mesa/platform.cpp 2014-08-07 13:22:53 +0000 | |||
| 2197 | +++ src/platform/graphics/mesa/platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 2198 | @@ -28,6 +28,7 @@ | |||
| 2199 | 28 | #include "mir/options/option.h" | 28 | #include "mir/options/option.h" |
| 2200 | 29 | #include "mir/graphics/native_buffer.h" | 29 | #include "mir/graphics/native_buffer.h" |
| 2201 | 30 | #include "mir/emergency_cleanup_registry.h" | 30 | #include "mir/emergency_cleanup_registry.h" |
| 2202 | 31 | #include "mir/udev/wrapper.h" | ||
| 2203 | 31 | 32 | ||
| 2204 | 32 | #include "drm_close_threadsafe.h" | 33 | #include "drm_close_threadsafe.h" |
| 2205 | 33 | 34 | ||
| 2206 | @@ -269,3 +270,30 @@ | |||
| 2207 | 269 | boost::program_options::value<bool>()->default_value(true), | 270 | boost::program_options::value<bool>()->default_value(true), |
| 2208 | 270 | "[platform-specific] utilize the bypass optimization for fullscreen surfaces."); | 271 | "[platform-specific] utilize the bypass optimization for fullscreen surfaces."); |
| 2209 | 271 | } | 272 | } |
| 2210 | 273 | |||
| 2211 | 274 | extern "C" mg::PlatformPriority probe_platform() | ||
| 2212 | 275 | { | ||
| 2213 | 276 | auto udev = std::make_shared<mir::udev::Context>(); | ||
| 2214 | 277 | |||
| 2215 | 278 | mir::udev::Enumerator drm_devices{udev}; | ||
| 2216 | 279 | drm_devices.match_subsystem("drm"); | ||
| 2217 | 280 | drm_devices.match_sysname("card[0-9]*"); | ||
| 2218 | 281 | drm_devices.scan_devices(); | ||
| 2219 | 282 | |||
| 2220 | 283 | for(auto& device : drm_devices) | ||
| 2221 | 284 | { | ||
| 2222 | 285 | static_cast<void>(device); | ||
| 2223 | 286 | return mg::PlatformPriority::best; | ||
| 2224 | 287 | } | ||
| 2225 | 288 | |||
| 2226 | 289 | return mg::PlatformPriority::unsupported; | ||
| 2227 | 290 | } | ||
| 2228 | 291 | |||
| 2229 | 292 | mg::ModuleProperties const description = { | ||
| 2230 | 293 | "mesa" | ||
| 2231 | 294 | }; | ||
| 2232 | 295 | |||
| 2233 | 296 | extern "C" mg::ModuleProperties const* describe_module() | ||
| 2234 | 297 | { | ||
| 2235 | 298 | return &description; | ||
| 2236 | 299 | } | ||
| 2237 | 272 | 300 | ||
| 2238 | === added file 'src/platform/graphics/mesa/symbols.map' | |||
| 2239 | --- src/platform/graphics/mesa/symbols.map 1970-01-01 00:00:00 +0000 | |||
| 2240 | +++ src/platform/graphics/mesa/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 2241 | @@ -0,0 +1,8 @@ | |||
| 2242 | 1 | MIR_GRAPHICS_PLATFORM_1 { | ||
| 2243 | 2 | global: | ||
| 2244 | 3 | add_platform_options; | ||
| 2245 | 4 | create_platform; | ||
| 2246 | 5 | create_native_platform; | ||
| 2247 | 6 | probe_platform; | ||
| 2248 | 7 | describe_module; | ||
| 2249 | 8 | }; | ||
| 2250 | 0 | 9 | ||
| 2251 | === added file 'src/platform/graphics/platform_probe.cpp' | |||
| 2252 | --- src/platform/graphics/platform_probe.cpp 1970-01-01 00:00:00 +0000 | |||
| 2253 | +++ src/platform/graphics/platform_probe.cpp 2014-08-29 01:18:58 +0000 | |||
| 2254 | @@ -0,0 +1,42 @@ | |||
| 2255 | 1 | /* | ||
| 2256 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 2257 | 3 | * | ||
| 2258 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2259 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 2260 | 6 | * as published by the Free Software Foundation. | ||
| 2261 | 7 | * | ||
| 2262 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2263 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2264 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2265 | 11 | * GNU Lesser General Public License for more details. | ||
| 2266 | 12 | * | ||
| 2267 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 2268 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2269 | 15 | * | ||
| 2270 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 2271 | 17 | */ | ||
| 2272 | 18 | |||
| 2273 | 19 | #include "mir/graphics/platform.h" | ||
| 2274 | 20 | #include "platform_probe.h" | ||
| 2275 | 21 | |||
| 2276 | 22 | std::shared_ptr<mir::SharedLibrary> | ||
| 2277 | 23 | mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules) | ||
| 2278 | 24 | { | ||
| 2279 | 25 | mir::graphics::PlatformPriority best_priority_so_far = mir::graphics::unsupported; | ||
| 2280 | 26 | std::shared_ptr<mir::SharedLibrary> best_module_so_far; | ||
| 2281 | 27 | for(auto& module : modules) | ||
| 2282 | 28 | { | ||
| 2283 | 29 | auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_platform"); | ||
| 2284 | 30 | auto module_priority = probe(); | ||
| 2285 | 31 | if (module_priority > best_priority_so_far) | ||
| 2286 | 32 | { | ||
| 2287 | 33 | best_priority_so_far = module_priority; | ||
| 2288 | 34 | best_module_so_far = module; | ||
| 2289 | 35 | } | ||
| 2290 | 36 | } | ||
| 2291 | 37 | if (best_priority_so_far > mir::graphics::unsupported) | ||
| 2292 | 38 | { | ||
| 2293 | 39 | return best_module_so_far; | ||
| 2294 | 40 | } | ||
| 2295 | 41 | throw std::runtime_error{"Failed to find platform for current system"}; | ||
| 2296 | 42 | } | ||
| 2297 | 0 | 43 | ||
| 2298 | === added file 'src/platform/graphics/platform_probe.h' | |||
| 2299 | --- src/platform/graphics/platform_probe.h 1970-01-01 00:00:00 +0000 | |||
| 2300 | +++ src/platform/graphics/platform_probe.h 2014-08-29 01:18:58 +0000 | |||
| 2301 | @@ -0,0 +1,37 @@ | |||
| 2302 | 1 | /* | ||
| 2303 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 2304 | 3 | * | ||
| 2305 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2306 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 2307 | 6 | * as published by the Free Software Foundation. | ||
| 2308 | 7 | * | ||
| 2309 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2310 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2311 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2312 | 11 | * GNU Lesser General Public License for more details. | ||
| 2313 | 12 | * | ||
| 2314 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 2315 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2316 | 15 | * | ||
| 2317 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 2318 | 17 | */ | ||
| 2319 | 18 | |||
| 2320 | 19 | #ifndef MIR_GRAPHICS_PLATFORM_PROBE_H_ | ||
| 2321 | 20 | #define MIR_GRAPHICS_PLATFORM_PROBE_H_ | ||
| 2322 | 21 | |||
| 2323 | 22 | #include <vector> | ||
| 2324 | 23 | #include <memory> | ||
| 2325 | 24 | #include "mir/shared_library.h" | ||
| 2326 | 25 | |||
| 2327 | 26 | namespace mir | ||
| 2328 | 27 | { | ||
| 2329 | 28 | namespace graphics | ||
| 2330 | 29 | { | ||
| 2331 | 30 | class Platform; | ||
| 2332 | 31 | |||
| 2333 | 32 | std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules); | ||
| 2334 | 33 | |||
| 2335 | 34 | } | ||
| 2336 | 35 | } | ||
| 2337 | 36 | |||
| 2338 | 37 | #endif // MIR_GRAPHICS_PLATFORM_PROBE_H_ | ||
| 2339 | 0 | 38 | ||
| 2340 | === modified file 'src/platform/options/default_configuration.cpp' | |||
| 2341 | --- src/platform/options/default_configuration.cpp 2014-08-07 09:48:53 +0000 | |||
| 2342 | +++ src/platform/options/default_configuration.cpp 2014-08-29 01:18:58 +0000 | |||
| 2343 | @@ -17,11 +17,12 @@ | |||
| 2344 | 17 | */ | 17 | */ |
| 2345 | 18 | 18 | ||
| 2346 | 19 | #include "mir/shared_library.h" | 19 | #include "mir/shared_library.h" |
| 2347 | 20 | #include "mir/shared_library_loader.h" | ||
| 2348 | 21 | #include "mir/options/default_configuration.h" | 20 | #include "mir/options/default_configuration.h" |
| 2349 | 22 | #include "mir/graphics/platform.h" | 21 | #include "mir/graphics/platform.h" |
| 2350 | 23 | #include "mir/default_configuration.h" | 22 | #include "mir/default_configuration.h" |
| 2351 | 24 | #include "mir/abnormal_exit.h" | 23 | #include "mir/abnormal_exit.h" |
| 2352 | 24 | #include "mir/shared_library_prober.h" | ||
| 2353 | 25 | #include "../graphics/platform_probe.h" | ||
| 2354 | 25 | 26 | ||
| 2355 | 26 | namespace mo = mir::options; | 27 | namespace mo = mir::options; |
| 2356 | 27 | 28 | ||
| 2357 | @@ -37,6 +38,7 @@ | |||
| 2358 | 37 | char const* const mo::connector_report_opt = "connector-report"; | 38 | char const* const mo::connector_report_opt = "connector-report"; |
| 2359 | 38 | char const* const mo::scene_report_opt = "scene-report"; | 39 | char const* const mo::scene_report_opt = "scene-report"; |
| 2360 | 39 | char const* const mo::input_report_opt = "input-report"; | 40 | char const* const mo::input_report_opt = "input-report"; |
| 2361 | 41 | char const* const mo::shared_library_prober_report_opt = "shared-library-prober-report"; | ||
| 2362 | 40 | char const* const mo::host_socket_opt = "host-socket"; | 42 | char const* const mo::host_socket_opt = "host-socket"; |
| 2363 | 41 | char const* const mo::frontend_threads_opt = "ipc-thread-pool"; | 43 | char const* const mo::frontend_threads_opt = "ipc-thread-pool"; |
| 2364 | 42 | char const* const mo::name_opt = "name"; | 44 | char const* const mo::name_opt = "name"; |
| 2365 | @@ -53,6 +55,7 @@ | |||
| 2366 | 53 | char const* const mo::lttng_opt_value = "lttng"; | 55 | char const* const mo::lttng_opt_value = "lttng"; |
| 2367 | 54 | 56 | ||
| 2368 | 55 | char const* const mo::platform_graphics_lib = "platform-graphics-lib"; | 57 | char const* const mo::platform_graphics_lib = "platform-graphics-lib"; |
| 2369 | 58 | char const* const mo::platform_graphics_path = "platform-graphics-path"; | ||
| 2370 | 56 | 59 | ||
| 2371 | 57 | namespace | 60 | namespace |
| 2372 | 58 | { | 61 | { |
| 2373 | @@ -61,7 +64,8 @@ | |||
| 2374 | 61 | int const glog_minloglevel_default = 0; | 64 | int const glog_minloglevel_default = 0; |
| 2375 | 62 | char const* const glog_log_dir_default = ""; | 65 | char const* const glog_log_dir_default = ""; |
| 2376 | 63 | bool const enable_input_default = true; | 66 | bool const enable_input_default = true; |
| 2378 | 64 | char const* const default_platform_graphics_lib = "libmirplatformgraphics.so"; | 67 | |
| 2379 | 68 | std::shared_ptr<mir::SharedLibrary> graphics_lib; | ||
| 2380 | 65 | } | 69 | } |
| 2381 | 66 | 70 | ||
| 2382 | 67 | mo::DefaultConfiguration::DefaultConfiguration(int argc, char const* argv[]) : | 71 | mo::DefaultConfiguration::DefaultConfiguration(int argc, char const* argv[]) : |
| 2383 | @@ -102,8 +106,10 @@ | |||
| 2384 | 102 | "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]") | 106 | "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]") |
| 2385 | 103 | (no_server_socket_opt, "Do not provide a socket filename for client connections") | 107 | (no_server_socket_opt, "Do not provide a socket filename for client connections") |
| 2386 | 104 | (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections") | 108 | (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections") |
| 2389 | 105 | (platform_graphics_lib, po::value<std::string>()->default_value(default_platform_graphics_lib), | 109 | (platform_graphics_lib, po::value<std::string>(), |
| 2390 | 106 | "Library to use for platform graphics support") | 110 | "Library to use for platform graphics support (default: autodetect)") |
| 2391 | 111 | (platform_graphics_path, po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH), | ||
| 2392 | 112 | "Library to use for platform graphics support (default: " MIR_SERVER_PLATFORM_PLUGIN_PATH ")") | ||
| 2393 | 107 | (enable_input_opt, po::value<bool>()->default_value(enable_input_default), | 113 | (enable_input_opt, po::value<bool>()->default_value(enable_input_default), |
| 2394 | 108 | "Enable input.") | 114 | "Enable input.") |
| 2395 | 109 | (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value), | 115 | (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value), |
| 2396 | @@ -122,6 +128,8 @@ | |||
| 2397 | 122 | "How to handle the MessageProcessor report. [{log,lttng,off}]") | 128 | "How to handle the MessageProcessor report. [{log,lttng,off}]") |
| 2398 | 123 | (scene_report_opt, po::value<std::string>()->default_value(off_opt_value), | 129 | (scene_report_opt, po::value<std::string>()->default_value(off_opt_value), |
| 2399 | 124 | "How to handle the scene report. [{log,lttng,off}]") | 130 | "How to handle the scene report. [{log,lttng,off}]") |
| 2400 | 131 | (shared_library_prober_report_opt, po::value<std::string>()->default_value(off_opt_value), | ||
| 2401 | 132 | "How to handle the shared library prober report. [{log,lttng,off}]") | ||
| 2402 | 125 | (glog, | 133 | (glog, |
| 2403 | 126 | "Use google::GLog for logging") | 134 | "Use google::GLog for logging") |
| 2404 | 127 | (glog_stderrthreshold, po::value<int>()->default_value(glog_stderrthreshold_default), | 135 | (glog_stderrthreshold, po::value<int>()->default_value(glog_stderrthreshold_default), |
| 2405 | @@ -149,30 +157,72 @@ | |||
| 2406 | 149 | add_platform_options(); | 157 | add_platform_options(); |
| 2407 | 150 | } | 158 | } |
| 2408 | 151 | 159 | ||
| 2409 | 160 | namespace | ||
| 2410 | 161 | { | ||
| 2411 | 162 | class NullSharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 2412 | 163 | { | ||
| 2413 | 164 | public: | ||
| 2414 | 165 | void probing_path(boost::filesystem::path const& /*path*/) override | ||
| 2415 | 166 | { | ||
| 2416 | 167 | } | ||
| 2417 | 168 | void probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) override | ||
| 2418 | 169 | { | ||
| 2419 | 170 | } | ||
| 2420 | 171 | void loading_library(boost::filesystem::path const& /*filename*/) override | ||
| 2421 | 172 | { | ||
| 2422 | 173 | } | ||
| 2423 | 174 | void loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) override | ||
| 2424 | 175 | { | ||
| 2425 | 176 | } | ||
| 2426 | 177 | }; | ||
| 2427 | 178 | } | ||
| 2428 | 179 | |||
| 2429 | 152 | void mo::DefaultConfiguration::add_platform_options() | 180 | void mo::DefaultConfiguration::add_platform_options() |
| 2430 | 153 | { | 181 | { |
| 2431 | 154 | namespace po = boost::program_options; | 182 | namespace po = boost::program_options; |
| 2432 | 155 | po::options_description program_options; | 183 | po::options_description program_options; |
| 2433 | 156 | program_options.add_options() | 184 | program_options.add_options() |
| 2434 | 157 | (platform_graphics_lib, | 185 | (platform_graphics_lib, |
| 2436 | 158 | po::value<std::string>()->default_value(default_platform_graphics_lib), ""); | 186 | po::value<std::string>(), ""); |
| 2437 | 187 | program_options.add_options() | ||
| 2438 | 188 | (platform_graphics_path, | ||
| 2439 | 189 | po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH), | ||
| 2440 | 190 | ""); | ||
| 2441 | 159 | mo::ProgramOption options; | 191 | mo::ProgramOption options; |
| 2442 | 160 | options.parse_arguments(program_options, argc, argv); | 192 | options.parse_arguments(program_options, argc, argv); |
| 2443 | 161 | 193 | ||
| 2445 | 162 | std::string graphics_libname; | 194 | // TODO: We should just load all the platform plugins we can and present their options. |
| 2446 | 163 | auto env_libname = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_LIB"); | 195 | auto env_libname = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_LIB"); |
| 2455 | 164 | if (!options.is_set(platform_graphics_lib) && env_libname) | 196 | auto env_libpath = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_PATH"); |
| 2456 | 165 | { | 197 | try |
| 2457 | 166 | graphics_libname = std::string{env_libname}; | 198 | { |
| 2458 | 167 | } | 199 | if (options.is_set(platform_graphics_lib)) |
| 2459 | 168 | else | 200 | { |
| 2460 | 169 | { | 201 | graphics_lib = std::make_shared<mir::SharedLibrary>(options.get<std::string>(platform_graphics_lib)); |
| 2461 | 170 | graphics_libname = options.get<std::string>(platform_graphics_lib); | 202 | } |
| 2462 | 171 | } | 203 | else if (env_libname) |
| 2463 | 204 | { | ||
| 2464 | 205 | graphics_lib = std::make_shared<mir::SharedLibrary>(std::string{env_libname}); | ||
| 2465 | 206 | } | ||
| 2466 | 207 | else | ||
| 2467 | 208 | { | ||
| 2468 | 209 | auto const plugin_path = env_libpath ? env_libpath : options.get<std::string>(platform_graphics_path); | ||
| 2469 | 210 | NullSharedLibraryProberReport nuller; | ||
| 2470 | 211 | auto plugins = mir::libraries_for_path(plugin_path, nuller); | ||
| 2471 | 212 | graphics_lib = mir::graphics::module_for_device(plugins); | ||
| 2472 | 213 | } | ||
| 2473 | 172 | 214 | ||
| 2477 | 173 | auto graphics_lib = load_library(graphics_libname); | 215 | auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options")); |
| 2478 | 174 | auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options")); | 216 | add_platform_options(*this->program_options); |
| 2479 | 175 | add_platform_options(*this->program_options); | 217 | } |
| 2480 | 218 | catch(...) | ||
| 2481 | 219 | { | ||
| 2482 | 220 | // We don't actually care at this point if this failed. | ||
| 2483 | 221 | // Maybe we've been pointed at the wrong place. Maybe this platform doesn't actually | ||
| 2484 | 222 | // *have* platform-specific options. | ||
| 2485 | 223 | // Regardless, if we need a platform and can't find one then we'll bail later | ||
| 2486 | 224 | // in startup with a useful error. | ||
| 2487 | 225 | } | ||
| 2488 | 176 | } | 226 | } |
| 2489 | 177 | 227 | ||
| 2490 | 178 | boost::program_options::options_description_easy_init mo::DefaultConfiguration::add_options() | 228 | boost::program_options::options_description_easy_init mo::DefaultConfiguration::add_options() |
| 2491 | 179 | 229 | ||
| 2492 | === removed file 'src/platform/shared_library_loader.cpp' | |||
| 2493 | --- src/platform/shared_library_loader.cpp 2014-03-20 16:49:52 +0000 | |||
| 2494 | +++ src/platform/shared_library_loader.cpp 1970-01-01 00:00:00 +0000 | |||
| 2495 | @@ -1,38 +0,0 @@ | |||
| 2496 | 1 | /* | ||
| 2497 | 2 | * Copyright © 2013 Canonical Ltd. | ||
| 2498 | 3 | * | ||
| 2499 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2500 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 2501 | 6 | * as published by the Free Software Foundation. | ||
| 2502 | 7 | * | ||
| 2503 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2504 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2505 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2506 | 11 | * GNU Lesser General Public License for more details. | ||
| 2507 | 12 | * | ||
| 2508 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 2509 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2510 | 15 | * | ||
| 2511 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | ||
| 2512 | 17 | */ | ||
| 2513 | 18 | |||
| 2514 | 19 | #include "mir/shared_library_loader.h" | ||
| 2515 | 20 | #include "mir/shared_library.h" | ||
| 2516 | 21 | #include <memory> | ||
| 2517 | 22 | #include <map> | ||
| 2518 | 23 | |||
| 2519 | 24 | mir::SharedLibrary const* mir::load_library(std::string const& libname) | ||
| 2520 | 25 | { | ||
| 2521 | 26 | // There's no point in loading twice, and it isn't safe to unload... | ||
| 2522 | 27 | static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache; | ||
| 2523 | 28 | |||
| 2524 | 29 | if (auto& ptr = libraries_cache[libname]) | ||
| 2525 | 30 | { | ||
| 2526 | 31 | return ptr.get(); | ||
| 2527 | 32 | } | ||
| 2528 | 33 | else | ||
| 2529 | 34 | { | ||
| 2530 | 35 | ptr = std::make_shared<mir::SharedLibrary>(libname); | ||
| 2531 | 36 | return ptr.get(); | ||
| 2532 | 37 | } | ||
| 2533 | 38 | } | ||
| 2534 | 39 | 0 | ||
| 2535 | === modified file 'src/platform/symbols.map' | |||
| 2536 | --- src/platform/symbols.map 2014-08-25 03:11:01 +0000 | |||
| 2537 | +++ src/platform/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 2538 | @@ -155,6 +155,7 @@ | |||
| 2539 | 155 | mir::graphics::InternalSurface::pixel_format*; | 155 | mir::graphics::InternalSurface::pixel_format*; |
| 2540 | 156 | mir::graphics::InternalSurface::size*; | 156 | mir::graphics::InternalSurface::size*; |
| 2541 | 157 | mir::graphics::InternalSurface::swap_buffers*; | 157 | mir::graphics::InternalSurface::swap_buffers*; |
| 2542 | 158 | mir::graphics::module_for_device*; | ||
| 2543 | 158 | mir::graphics::NativePlatform::create_buffer_allocator*; | 159 | mir::graphics::NativePlatform::create_buffer_allocator*; |
| 2544 | 159 | mir::graphics::NativePlatform::create_internal_client*; | 160 | mir::graphics::NativePlatform::create_internal_client*; |
| 2545 | 160 | mir::graphics::NativePlatform::fill_buffer_package*; | 161 | mir::graphics::NativePlatform::fill_buffer_package*; |
| 2546 | @@ -225,6 +226,7 @@ | |||
| 2547 | 225 | mir::options::glog_log_dir*; | 226 | mir::options::glog_log_dir*; |
| 2548 | 226 | mir::options::glog_minloglevel*; | 227 | mir::options::glog_minloglevel*; |
| 2549 | 227 | mir::options::glog_stderrthreshold*; | 228 | mir::options::glog_stderrthreshold*; |
| 2550 | 229 | mir::options::platform_graphics_path*; | ||
| 2551 | 228 | mir::options::host_socket_opt*; | 230 | mir::options::host_socket_opt*; |
| 2552 | 229 | mir::options::input_report_opt*; | 231 | mir::options::input_report_opt*; |
| 2553 | 230 | mir::options::legacy_input_report_opt*; | 232 | mir::options::legacy_input_report_opt*; |
| 2554 | @@ -252,6 +254,7 @@ | |||
| 2555 | 252 | mir::options::scene_report_opt*; | 254 | mir::options::scene_report_opt*; |
| 2556 | 253 | mir::options::server_socket_opt*; | 255 | mir::options::server_socket_opt*; |
| 2557 | 254 | mir::options::session_mediator_report_opt*; | 256 | mir::options::session_mediator_report_opt*; |
| 2558 | 257 | mir::options::shared_library_prober_report_opt*; | ||
| 2559 | 255 | typeinfo?for?mir::AbnormalExit; | 258 | typeinfo?for?mir::AbnormalExit; |
| 2560 | 256 | typeinfo?for?mir::EmergencyCleanupRegistry; | 259 | typeinfo?for?mir::EmergencyCleanupRegistry; |
| 2561 | 257 | typeinfo?for?mir::FatalErrorStrategy; | 260 | typeinfo?for?mir::FatalErrorStrategy; |
| 2562 | 258 | 261 | ||
| 2563 | === modified file 'src/server/CMakeLists.txt' | |||
| 2564 | --- src/server/CMakeLists.txt 2014-08-18 09:05:55 +0000 | |||
| 2565 | +++ src/server/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2566 | @@ -2,6 +2,8 @@ | |||
| 2567 | 2 | ${PROJECT_SOURCE_DIR}/include/platform | 2 | ${PROJECT_SOURCE_DIR}/include/platform |
| 2568 | 3 | ${PROJECT_SOURCE_DIR}/include/server) | 3 | ${PROJECT_SOURCE_DIR}/include/server) |
| 2569 | 4 | 4 | ||
| 2570 | 5 | add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}") | ||
| 2571 | 6 | |||
| 2572 | 5 | add_subdirectory(compositor/) | 7 | add_subdirectory(compositor/) |
| 2573 | 6 | add_subdirectory(graphics/) | 8 | add_subdirectory(graphics/) |
| 2574 | 7 | add_subdirectory(input/) | 9 | add_subdirectory(input/) |
| 2575 | @@ -65,8 +67,9 @@ | |||
| 2576 | 65 | ) | 67 | ) |
| 2577 | 66 | 68 | ||
| 2578 | 67 | target_link_libraries(mirserver LINK_PUBLIC | 69 | target_link_libraries(mirserver LINK_PUBLIC |
| 2579 | 70 | |||
| 2580 | 71 | mirclient | ||
| 2581 | 68 | mirplatform | 72 | mirplatform |
| 2582 | 69 | mirclient | ||
| 2583 | 70 | mircommon | 73 | mircommon |
| 2584 | 71 | 3rd_party | 74 | 3rd_party |
| 2585 | 72 | xcursorloader | 75 | xcursorloader |
| 2586 | 73 | 76 | ||
| 2587 | === modified file 'src/server/graphics/CMakeLists.txt' | |||
| 2588 | --- src/server/graphics/CMakeLists.txt 2014-08-06 12:22:34 +0000 | |||
| 2589 | +++ src/server/graphics/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2590 | @@ -1,4 +1,4 @@ | |||
| 2592 | 1 | include_directories(${GLESv2_INCLUDE_DIRS}) | 1 | include_directories(${GLESv2_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}) |
| 2593 | 2 | 2 | ||
| 2594 | 3 | add_library( | 3 | add_library( |
| 2595 | 4 | mirgraphics OBJECT | 4 | mirgraphics OBJECT |
| 2596 | 5 | 5 | ||
| 2597 | === modified file 'src/server/graphics/default_configuration.cpp' | |||
| 2598 | --- src/server/graphics/default_configuration.cpp 2014-07-30 15:25:54 +0000 | |||
| 2599 | +++ src/server/graphics/default_configuration.cpp 2014-08-29 01:18:58 +0000 | |||
| 2600 | @@ -28,10 +28,11 @@ | |||
| 2601 | 28 | #include "mir/graphics/buffer_initializer.h" | 28 | #include "mir/graphics/buffer_initializer.h" |
| 2602 | 29 | #include "mir/graphics/gl_config.h" | 29 | #include "mir/graphics/gl_config.h" |
| 2603 | 30 | #include "mir/graphics/cursor.h" | 30 | #include "mir/graphics/cursor.h" |
| 2604 | 31 | #include "src/platform/graphics/platform_probe.h" | ||
| 2605 | 31 | #include "program_factory.h" | 32 | #include "program_factory.h" |
| 2606 | 32 | 33 | ||
| 2607 | 33 | #include "mir/shared_library.h" | 34 | #include "mir/shared_library.h" |
| 2609 | 34 | #include "mir/shared_library_loader.h" | 35 | #include "mir/shared_library_prober.h" |
| 2610 | 35 | #include "mir/abnormal_exit.h" | 36 | #include "mir/abnormal_exit.h" |
| 2611 | 36 | #include "mir/emergency_cleanup.h" | 37 | #include "mir/emergency_cleanup.h" |
| 2612 | 37 | 38 | ||
| 2613 | @@ -43,6 +44,12 @@ | |||
| 2614 | 43 | 44 | ||
| 2615 | 44 | namespace mg = mir::graphics; | 45 | namespace mg = mir::graphics; |
| 2616 | 45 | 46 | ||
| 2617 | 47 | namespace | ||
| 2618 | 48 | { | ||
| 2619 | 49 | // TODO: Temporary, until we actually manage module lifetimes | ||
| 2620 | 50 | static std::shared_ptr<mir::SharedLibrary> platform_library; | ||
| 2621 | 51 | } | ||
| 2622 | 52 | |||
| 2623 | 46 | std::shared_ptr<mg::BufferInitializer> | 53 | std::shared_ptr<mg::BufferInitializer> |
| 2624 | 47 | mir::DefaultServerConfiguration::the_buffer_initializer() | 54 | mir::DefaultServerConfiguration::the_buffer_initializer() |
| 2625 | 48 | { | 55 | { |
| 2626 | @@ -71,14 +78,26 @@ | |||
| 2627 | 71 | if (!the_options()->is_set(options::host_socket_opt)) | 78 | if (!the_options()->is_set(options::host_socket_opt)) |
| 2628 | 72 | { | 79 | { |
| 2629 | 73 | // fallback to standalone if host socket is unset | 80 | // fallback to standalone if host socket is unset |
| 2632 | 74 | auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib)); | 81 | if (the_options()->is_set(options::platform_graphics_lib)) |
| 2633 | 75 | auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform"); | 82 | { |
| 2634 | 83 | platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib)); | ||
| 2635 | 84 | } | ||
| 2636 | 85 | else | ||
| 2637 | 86 | { | ||
| 2638 | 87 | auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), *the_shared_library_prober_report()); | ||
| 2639 | 88 | if (platforms.empty()) | ||
| 2640 | 89 | { | ||
| 2641 | 90 | throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH); | ||
| 2642 | 91 | } | ||
| 2643 | 92 | platform_library = mir::graphics::module_for_device(platforms); | ||
| 2644 | 93 | } | ||
| 2645 | 94 | auto create_platform = platform_library->load_function<mg::CreatePlatform>("create_platform"); | ||
| 2646 | 76 | return create_platform(the_options(), the_emergency_cleanup(), the_display_report()); | 95 | return create_platform(the_options(), the_emergency_cleanup(), the_display_report()); |
| 2647 | 77 | } | 96 | } |
| 2648 | 78 | 97 | ||
| 2649 | 79 | return std::make_shared<mir::graphics::nested::NestedPlatform>( | 98 | return std::make_shared<mir::graphics::nested::NestedPlatform>( |
| 2650 | 80 | the_host_connection(), | 99 | the_host_connection(), |
| 2652 | 81 | the_input_dispatcher(), | 100 | the_input_dispatcher(), |
| 2653 | 82 | the_display_report(), | 101 | the_display_report(), |
| 2654 | 83 | the_graphics_native_platform()); | 102 | the_graphics_native_platform()); |
| 2655 | 84 | }); | 103 | }); |
| 2656 | @@ -89,8 +108,20 @@ | |||
| 2657 | 89 | return graphics_native_platform( | 108 | return graphics_native_platform( |
| 2658 | 90 | [this]() | 109 | [this]() |
| 2659 | 91 | { | 110 | { |
| 2662 | 92 | auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib)); | 111 | if (the_options()->is_set(options::platform_graphics_lib)) |
| 2663 | 93 | auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform"); | 112 | { |
| 2664 | 113 | platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib)); | ||
| 2665 | 114 | } | ||
| 2666 | 115 | else | ||
| 2667 | 116 | { | ||
| 2668 | 117 | auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), *the_shared_library_prober_report()); | ||
| 2669 | 118 | if (platforms.empty()) | ||
| 2670 | 119 | { | ||
| 2671 | 120 | throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH); | ||
| 2672 | 121 | } | ||
| 2673 | 122 | platform_library = mir::graphics::module_for_device(platforms); | ||
| 2674 | 123 | } | ||
| 2675 | 124 | auto create_native_platform = platform_library->load_function<mg::CreateNativePlatform>("create_native_platform"); | ||
| 2676 | 94 | 125 | ||
| 2677 | 95 | return create_native_platform(the_display_report()); | 126 | return create_native_platform(the_display_report()); |
| 2678 | 96 | }); | 127 | }); |
| 2679 | 97 | 128 | ||
| 2680 | === modified file 'src/server/logging/CMakeLists.txt' | |||
| 2681 | --- src/server/logging/CMakeLists.txt 2014-08-06 12:36:12 +0000 | |||
| 2682 | +++ src/server/logging/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2683 | @@ -12,4 +12,3 @@ | |||
| 2684 | 12 | 12 | ||
| 2685 | 13 | ${LOGGING_SOURCES} | 13 | ${LOGGING_SOURCES} |
| 2686 | 14 | ) | 14 | ) |
| 2687 | 15 | |||
| 2688 | 16 | 15 | ||
| 2689 | === modified file 'src/server/report/default_server_configuration.cpp' | |||
| 2690 | --- src/server/report/default_server_configuration.cpp 2014-03-06 06:05:17 +0000 | |||
| 2691 | +++ src/server/report/default_server_configuration.cpp 2014-08-29 01:18:58 +0000 | |||
| 2692 | @@ -117,3 +117,12 @@ | |||
| 2693 | 117 | return report_factory(options::scene_report_opt)->create_scene_report(); | 117 | return report_factory(options::scene_report_opt)->create_scene_report(); |
| 2694 | 118 | }); | 118 | }); |
| 2695 | 119 | } | 119 | } |
| 2696 | 120 | |||
| 2697 | 121 | auto mir::DefaultServerConfiguration::the_shared_library_prober_report() -> std::shared_ptr<SharedLibraryProberReport> | ||
| 2698 | 122 | { | ||
| 2699 | 123 | return shared_library_prober_report( | ||
| 2700 | 124 | [this]()->std::shared_ptr<SharedLibraryProberReport> | ||
| 2701 | 125 | { | ||
| 2702 | 126 | return report_factory(options::shared_library_prober_report_opt)->create_shared_library_prober_report(); | ||
| 2703 | 127 | }); | ||
| 2704 | 128 | } | ||
| 2705 | 120 | 129 | ||
| 2706 | === modified file 'src/server/report/logging/CMakeLists.txt' | |||
| 2707 | --- src/server/report/logging/CMakeLists.txt 2014-08-06 12:22:34 +0000 | |||
| 2708 | +++ src/server/report/logging/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2709 | @@ -18,4 +18,3 @@ | |||
| 2710 | 18 | 18 | ||
| 2711 | 19 | ${LOGGING_SOURCES} | 19 | ${LOGGING_SOURCES} |
| 2712 | 20 | ) | 20 | ) |
| 2713 | 21 | |||
| 2714 | 22 | 21 | ||
| 2715 | === modified file 'src/server/report/logging/logging_report_factory.cpp' | |||
| 2716 | --- src/server/report/logging/logging_report_factory.cpp 2014-02-11 15:18:07 +0000 | |||
| 2717 | +++ src/server/report/logging/logging_report_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 2718 | @@ -25,6 +25,7 @@ | |||
| 2719 | 25 | #include "scene_report.h" | 25 | #include "scene_report.h" |
| 2720 | 26 | #include "session_mediator_report.h" | 26 | #include "session_mediator_report.h" |
| 2721 | 27 | #include "input_report.h" | 27 | #include "input_report.h" |
| 2722 | 28 | #include "mir/logging/shared_library_prober_report.h" | ||
| 2723 | 28 | 29 | ||
| 2724 | 29 | #include "mir/default_server_configuration.h" | 30 | #include "mir/default_server_configuration.h" |
| 2725 | 30 | 31 | ||
| 2726 | @@ -72,4 +73,7 @@ | |||
| 2727 | 72 | return std::make_shared<logging::InputReport>(logger); | 73 | return std::make_shared<logging::InputReport>(logger); |
| 2728 | 73 | } | 74 | } |
| 2729 | 74 | 75 | ||
| 2731 | 75 | 76 | std::shared_ptr<mir::SharedLibraryProberReport> mr::LoggingReportFactory::create_shared_library_prober_report() | |
| 2732 | 77 | { | ||
| 2733 | 78 | return std::make_shared<mir::logging::SharedLibraryProberReport>(logger); | ||
| 2734 | 79 | } | ||
| 2735 | 76 | 80 | ||
| 2736 | === modified file 'src/server/report/logging_report_factory.h' | |||
| 2737 | --- src/server/report/logging_report_factory.h 2014-02-11 15:18:07 +0000 | |||
| 2738 | +++ src/server/report/logging_report_factory.h 2014-08-29 01:18:58 +0000 | |||
| 2739 | @@ -47,6 +47,8 @@ | |||
| 2740 | 47 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; | 47 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; |
| 2741 | 48 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; | 48 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; |
| 2742 | 49 | std::shared_ptr<input::InputReport> create_input_report() override; | 49 | std::shared_ptr<input::InputReport> create_input_report() override; |
| 2743 | 50 | std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override; | ||
| 2744 | 51 | |||
| 2745 | 50 | 52 | ||
| 2746 | 51 | private: | 53 | private: |
| 2747 | 52 | std::shared_ptr<mir::logging::Logger> const logger; | 54 | std::shared_ptr<mir::logging::Logger> const logger; |
| 2748 | 53 | 55 | ||
| 2749 | === modified file 'src/server/report/lttng/CMakeLists.txt' | |||
| 2750 | --- src/server/report/lttng/CMakeLists.txt 2014-08-06 12:22:34 +0000 | |||
| 2751 | +++ src/server/report/lttng/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2752 | @@ -17,6 +17,7 @@ | |||
| 2753 | 17 | session_mediator_report.cpp | 17 | session_mediator_report.cpp |
| 2754 | 18 | scene_report.cpp | 18 | scene_report.cpp |
| 2755 | 19 | server_tracepoint_provider.cpp | 19 | server_tracepoint_provider.cpp |
| 2756 | 20 | shared_library_prober_report.cpp | ||
| 2757 | 20 | ) | 21 | ) |
| 2758 | 21 | 22 | ||
| 2759 | 22 | add_library( | 23 | add_library( |
| 2760 | 23 | 24 | ||
| 2761 | === modified file 'src/server/report/lttng/lttng_report_factory.cpp' | |||
| 2762 | --- src/server/report/lttng/lttng_report_factory.cpp 2014-02-11 15:18:07 +0000 | |||
| 2763 | +++ src/server/report/lttng/lttng_report_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 2764 | @@ -25,6 +25,7 @@ | |||
| 2765 | 25 | #include "message_processor_report.h" | 25 | #include "message_processor_report.h" |
| 2766 | 26 | #include "scene_report.h" | 26 | #include "scene_report.h" |
| 2767 | 27 | #include "session_mediator_report.h" | 27 | #include "session_mediator_report.h" |
| 2768 | 28 | #include "shared_library_prober_report.h" | ||
| 2769 | 28 | 29 | ||
| 2770 | 29 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::LttngReportFactory::create_compositor_report() | 30 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::LttngReportFactory::create_compositor_report() |
| 2771 | 30 | { | 31 | { |
| 2772 | @@ -61,4 +62,8 @@ | |||
| 2773 | 61 | return std::make_shared<lttng::InputReport>(); | 62 | return std::make_shared<lttng::InputReport>(); |
| 2774 | 62 | } | 63 | } |
| 2775 | 63 | 64 | ||
| 2776 | 65 | std::shared_ptr<mir::SharedLibraryProberReport> mir::report::LttngReportFactory::create_shared_library_prober_report() | ||
| 2777 | 66 | { | ||
| 2778 | 67 | return std::make_shared<lttng::SharedLibraryProberReport>(); | ||
| 2779 | 68 | } | ||
| 2780 | 64 | 69 | ||
| 2781 | 65 | 70 | ||
| 2782 | === added file 'src/server/report/lttng/shared_library_prober_report.cpp' | |||
| 2783 | --- src/server/report/lttng/shared_library_prober_report.cpp 1970-01-01 00:00:00 +0000 | |||
| 2784 | +++ src/server/report/lttng/shared_library_prober_report.cpp 2014-08-29 01:18:58 +0000 | |||
| 2785 | @@ -0,0 +1,48 @@ | |||
| 2786 | 1 | /* | ||
| 2787 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 2788 | 3 | * | ||
| 2789 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2790 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 2791 | 6 | * as published by the Free Software Foundation. | ||
| 2792 | 7 | * | ||
| 2793 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2794 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2795 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2796 | 11 | * GNU General Public License for more details. | ||
| 2797 | 12 | * | ||
| 2798 | 13 | * You should have received a copy of the GNU General Public License | ||
| 2799 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2800 | 15 | * | ||
| 2801 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 2802 | 17 | */ | ||
| 2803 | 18 | |||
| 2804 | 19 | #include "shared_library_prober_report.h" | ||
| 2805 | 20 | #include "mir/report/lttng/mir_tracepoint.h" | ||
| 2806 | 21 | |||
| 2807 | 22 | #define TRACEPOINT_DEFINE | ||
| 2808 | 23 | #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE | ||
| 2809 | 24 | #include "shared_library_prober_report_tp.h" | ||
| 2810 | 25 | |||
| 2811 | 26 | void mir::report::lttng::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path) | ||
| 2812 | 27 | { | ||
| 2813 | 28 | mir_tracepoint(mir_server_shared_library_prober, probing_path, | ||
| 2814 | 29 | path.string().c_str()); | ||
| 2815 | 30 | } | ||
| 2816 | 31 | |||
| 2817 | 32 | void mir::report::lttng::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error) | ||
| 2818 | 33 | { | ||
| 2819 | 34 | mir_tracepoint(mir_server_shared_library_prober, probing_failed, | ||
| 2820 | 35 | path.string().c_str(), error.what()); | ||
| 2821 | 36 | } | ||
| 2822 | 37 | |||
| 2823 | 38 | void mir::report::lttng::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename) | ||
| 2824 | 39 | { | ||
| 2825 | 40 | mir_tracepoint(mir_server_shared_library_prober, loading_library, | ||
| 2826 | 41 | filename.string().c_str()); | ||
| 2827 | 42 | } | ||
| 2828 | 43 | |||
| 2829 | 44 | void mir::report::lttng::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error) | ||
| 2830 | 45 | { | ||
| 2831 | 46 | mir_tracepoint(mir_server_shared_library_prober, loading_failed, | ||
| 2832 | 47 | filename.string().c_str(), error.what()); | ||
| 2833 | 48 | } | ||
| 2834 | 0 | 49 | ||
| 2835 | === added file 'src/server/report/lttng/shared_library_prober_report.h' | |||
| 2836 | --- src/server/report/lttng/shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 2837 | +++ src/server/report/lttng/shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 2838 | @@ -0,0 +1,52 @@ | |||
| 2839 | 1 | /* | ||
| 2840 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 2841 | 3 | * | ||
| 2842 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2843 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 2844 | 6 | * as published by the Free Software Foundation. | ||
| 2845 | 7 | * | ||
| 2846 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2847 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2848 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2849 | 11 | * GNU General Public License for more details. | ||
| 2850 | 12 | * | ||
| 2851 | 13 | * You should have received a copy of the GNU General Public License | ||
| 2852 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2853 | 15 | * | ||
| 2854 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 2855 | 17 | */ | ||
| 2856 | 18 | |||
| 2857 | 19 | #ifndef MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 2858 | 20 | #define MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 2859 | 21 | |||
| 2860 | 22 | #include "server_tracepoint_provider.h" | ||
| 2861 | 23 | |||
| 2862 | 24 | #include "mir/shared_library_prober_report.h" | ||
| 2863 | 25 | |||
| 2864 | 26 | #include <stdexcept> | ||
| 2865 | 27 | #include <string> | ||
| 2866 | 28 | |||
| 2867 | 29 | namespace mir | ||
| 2868 | 30 | { | ||
| 2869 | 31 | namespace report | ||
| 2870 | 32 | { | ||
| 2871 | 33 | namespace lttng | ||
| 2872 | 34 | { | ||
| 2873 | 35 | |||
| 2874 | 36 | class SharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 2875 | 37 | { | ||
| 2876 | 38 | public: | ||
| 2877 | 39 | void probing_path(boost::filesystem::path const& path) override; | ||
| 2878 | 40 | void probing_failed(boost::filesystem::path const& path, std::exception const& error) override; | ||
| 2879 | 41 | void loading_library(boost::filesystem::path const& filename) override; | ||
| 2880 | 42 | void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override; | ||
| 2881 | 43 | |||
| 2882 | 44 | private: | ||
| 2883 | 45 | ServerTracepointProvider tp_provider; | ||
| 2884 | 46 | }; | ||
| 2885 | 47 | |||
| 2886 | 48 | } | ||
| 2887 | 49 | } | ||
| 2888 | 50 | } | ||
| 2889 | 51 | |||
| 2890 | 52 | #endif // MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 2891 | 0 | 53 | ||
| 2892 | === added file 'src/server/report/lttng/shared_library_prober_report_tp.h' | |||
| 2893 | --- src/server/report/lttng/shared_library_prober_report_tp.h 1970-01-01 00:00:00 +0000 | |||
| 2894 | +++ src/server/report/lttng/shared_library_prober_report_tp.h 2014-08-29 01:18:58 +0000 | |||
| 2895 | @@ -0,0 +1,71 @@ | |||
| 2896 | 1 | /* | ||
| 2897 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 2898 | 3 | * | ||
| 2899 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 2900 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 2901 | 6 | * as published by the Free Software Foundation. | ||
| 2902 | 7 | * | ||
| 2903 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 2904 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 2905 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 2906 | 11 | * GNU General Public License for more details. | ||
| 2907 | 12 | * | ||
| 2908 | 13 | * You should have received a copy of the GNU General Public License | ||
| 2909 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 2910 | 15 | * | ||
| 2911 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 2912 | 17 | */ | ||
| 2913 | 18 | |||
| 2914 | 19 | #undef TRACEPOINT_PROVIDER | ||
| 2915 | 20 | #define TRACEPOINT_PROVIDER mir_server_shared_library_prober | ||
| 2916 | 21 | |||
| 2917 | 22 | #undef TRACEPOINT_INCLUDE | ||
| 2918 | 23 | #define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h" | ||
| 2919 | 24 | |||
| 2920 | 25 | #if !defined(MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ) | ||
| 2921 | 26 | #define MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ | ||
| 2922 | 27 | |||
| 2923 | 28 | #include <lttng/tracepoint.h> | ||
| 2924 | 29 | #include <stdint.h> | ||
| 2925 | 30 | |||
| 2926 | 31 | TRACEPOINT_EVENT( | ||
| 2927 | 32 | mir_server_shared_library_prober, | ||
| 2928 | 33 | probing_path, | ||
| 2929 | 34 | TP_ARGS(const char*, path), | ||
| 2930 | 35 | TP_FIELDS( | ||
| 2931 | 36 | ctf_string(path, path) | ||
| 2932 | 37 | ) | ||
| 2933 | 38 | ) | ||
| 2934 | 39 | |||
| 2935 | 40 | TRACEPOINT_EVENT( | ||
| 2936 | 41 | mir_server_shared_library_prober, | ||
| 2937 | 42 | probing_failed, | ||
| 2938 | 43 | TP_ARGS(const char*, path, const char*, message), | ||
| 2939 | 44 | TP_FIELDS( | ||
| 2940 | 45 | ctf_string(path, path) | ||
| 2941 | 46 | ctf_string(message, message) | ||
| 2942 | 47 | ) | ||
| 2943 | 48 | ) | ||
| 2944 | 49 | |||
| 2945 | 50 | TRACEPOINT_EVENT( | ||
| 2946 | 51 | mir_server_shared_library_prober, | ||
| 2947 | 52 | loading_library, | ||
| 2948 | 53 | TP_ARGS(const char*, path), | ||
| 2949 | 54 | TP_FIELDS( | ||
| 2950 | 55 | ctf_string(path, path) | ||
| 2951 | 56 | ) | ||
| 2952 | 57 | ) | ||
| 2953 | 58 | |||
| 2954 | 59 | TRACEPOINT_EVENT( | ||
| 2955 | 60 | mir_server_shared_library_prober, | ||
| 2956 | 61 | loading_failed, | ||
| 2957 | 62 | TP_ARGS(const char*, path, const char*, message), | ||
| 2958 | 63 | TP_FIELDS( | ||
| 2959 | 64 | ctf_string(path, path) | ||
| 2960 | 65 | ctf_string(message, message) | ||
| 2961 | 66 | ) | ||
| 2962 | 67 | ) | ||
| 2963 | 68 | |||
| 2964 | 69 | #endif /* MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */ | ||
| 2965 | 70 | |||
| 2966 | 71 | #include <lttng/tracepoint-event.h> | ||
| 2967 | 0 | 72 | ||
| 2968 | === modified file 'src/server/report/lttng_report_factory.h' | |||
| 2969 | --- src/server/report/lttng_report_factory.h 2014-02-11 15:18:07 +0000 | |||
| 2970 | +++ src/server/report/lttng_report_factory.h 2014-08-29 01:18:58 +0000 | |||
| 2971 | @@ -35,6 +35,7 @@ | |||
| 2972 | 35 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; | 35 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; |
| 2973 | 36 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; | 36 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; |
| 2974 | 37 | std::shared_ptr<input::InputReport> create_input_report() override; | 37 | std::shared_ptr<input::InputReport> create_input_report() override; |
| 2975 | 38 | std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override; | ||
| 2976 | 38 | }; | 39 | }; |
| 2977 | 39 | } | 40 | } |
| 2978 | 40 | } | 41 | } |
| 2979 | 41 | 42 | ||
| 2980 | === modified file 'src/server/report/null/CMakeLists.txt' | |||
| 2981 | --- src/server/report/null/CMakeLists.txt 2014-08-06 12:22:34 +0000 | |||
| 2982 | +++ src/server/report/null/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 2983 | @@ -9,4 +9,5 @@ | |||
| 2984 | 9 | null_report_factory.cpp | 9 | null_report_factory.cpp |
| 2985 | 10 | scene_report.cpp | 10 | scene_report.cpp |
| 2986 | 11 | session_mediator_report.cpp | 11 | session_mediator_report.cpp |
| 2987 | 12 | shared_library_prober_report.cpp | ||
| 2988 | 12 | ) | 13 | ) |
| 2989 | 13 | 14 | ||
| 2990 | === modified file 'src/server/report/null/null_report_factory.cpp' | |||
| 2991 | --- src/server/report/null/null_report_factory.cpp 2014-02-17 22:35:23 +0000 | |||
| 2992 | +++ src/server/report/null/null_report_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 2993 | @@ -25,6 +25,7 @@ | |||
| 2994 | 25 | #include "display_report.h" | 25 | #include "display_report.h" |
| 2995 | 26 | #include "input_report.h" | 26 | #include "input_report.h" |
| 2996 | 27 | #include "scene_report.h" | 27 | #include "scene_report.h" |
| 2997 | 28 | #include "shared_library_prober_report.h" | ||
| 2998 | 28 | 29 | ||
| 2999 | 29 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report() | 30 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report() |
| 3000 | 30 | { | 31 | { |
| 3001 | @@ -61,6 +62,11 @@ | |||
| 3002 | 61 | return std::make_shared<null::InputReport>(); | 62 | return std::make_shared<null::InputReport>(); |
| 3003 | 62 | } | 63 | } |
| 3004 | 63 | 64 | ||
| 3005 | 65 | std::shared_ptr<mir::SharedLibraryProberReport> mir::report::NullReportFactory::create_shared_library_prober_report() | ||
| 3006 | 66 | { | ||
| 3007 | 67 | return std::make_shared<null::SharedLibraryProberReport>(); | ||
| 3008 | 68 | } | ||
| 3009 | 69 | |||
| 3010 | 64 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::null_compositor_report() | 70 | std::shared_ptr<mir::compositor::CompositorReport> mir::report::null_compositor_report() |
| 3011 | 65 | { | 71 | { |
| 3012 | 66 | return NullReportFactory{}.create_compositor_report(); | 72 | return NullReportFactory{}.create_compositor_report(); |
| 3013 | @@ -90,3 +96,8 @@ | |||
| 3014 | 90 | { | 96 | { |
| 3015 | 91 | return NullReportFactory{}.create_input_report(); | 97 | return NullReportFactory{}.create_input_report(); |
| 3016 | 92 | } | 98 | } |
| 3017 | 99 | |||
| 3018 | 100 | std::shared_ptr<mir::SharedLibraryProberReport> mir::report::null_shared_library_prober_report() | ||
| 3019 | 101 | { | ||
| 3020 | 102 | return NullReportFactory{}.create_shared_library_prober_report(); | ||
| 3021 | 103 | } | ||
| 3022 | 93 | 104 | ||
| 3023 | === added file 'src/server/report/null/shared_library_prober_report.cpp' | |||
| 3024 | --- src/server/report/null/shared_library_prober_report.cpp 1970-01-01 00:00:00 +0000 | |||
| 3025 | +++ src/server/report/null/shared_library_prober_report.cpp 2014-08-29 01:18:58 +0000 | |||
| 3026 | @@ -0,0 +1,35 @@ | |||
| 3027 | 1 | /* | ||
| 3028 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3029 | 3 | * | ||
| 3030 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3031 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 3032 | 6 | * as published by the Free Software Foundation. | ||
| 3033 | 7 | * | ||
| 3034 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3035 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3036 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3037 | 11 | * GNU General Public License for more details. | ||
| 3038 | 12 | * | ||
| 3039 | 13 | * You should have received a copy of the GNU General Public License | ||
| 3040 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3041 | 15 | * | ||
| 3042 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 3043 | 17 | */ | ||
| 3044 | 18 | |||
| 3045 | 19 | #include "shared_library_prober_report.h" | ||
| 3046 | 20 | |||
| 3047 | 21 | void mir::report::null::SharedLibraryProberReport::probing_path(boost::filesystem::path const& /*path*/) | ||
| 3048 | 22 | { | ||
| 3049 | 23 | } | ||
| 3050 | 24 | |||
| 3051 | 25 | void mir::report::null::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) | ||
| 3052 | 26 | { | ||
| 3053 | 27 | } | ||
| 3054 | 28 | |||
| 3055 | 29 | void mir::report::null::SharedLibraryProberReport::loading_library(boost::filesystem::path const& /*filename*/) | ||
| 3056 | 30 | { | ||
| 3057 | 31 | } | ||
| 3058 | 32 | |||
| 3059 | 33 | void mir::report::null::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) | ||
| 3060 | 34 | { | ||
| 3061 | 35 | } | ||
| 3062 | 0 | 36 | ||
| 3063 | === added file 'src/server/report/null/shared_library_prober_report.h' | |||
| 3064 | --- src/server/report/null/shared_library_prober_report.h 1970-01-01 00:00:00 +0000 | |||
| 3065 | +++ src/server/report/null/shared_library_prober_report.h 2014-08-29 01:18:58 +0000 | |||
| 3066 | @@ -0,0 +1,43 @@ | |||
| 3067 | 1 | /* | ||
| 3068 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3069 | 3 | * | ||
| 3070 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3071 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 3072 | 6 | * as published by the Free Software Foundation. | ||
| 3073 | 7 | * | ||
| 3074 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3075 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3076 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3077 | 11 | * GNU General Public License for more details. | ||
| 3078 | 12 | * | ||
| 3079 | 13 | * You should have received a copy of the GNU General Public License | ||
| 3080 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3081 | 15 | * | ||
| 3082 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 3083 | 17 | */ | ||
| 3084 | 18 | |||
| 3085 | 19 | #ifndef MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 3086 | 20 | #define MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 3087 | 21 | |||
| 3088 | 22 | #include "mir/shared_library_prober_report.h" | ||
| 3089 | 23 | |||
| 3090 | 24 | namespace mir | ||
| 3091 | 25 | { | ||
| 3092 | 26 | namespace report | ||
| 3093 | 27 | { | ||
| 3094 | 28 | namespace null | ||
| 3095 | 29 | { | ||
| 3096 | 30 | class SharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 3097 | 31 | { | ||
| 3098 | 32 | public: | ||
| 3099 | 33 | void probing_path(boost::filesystem::path const& path); | ||
| 3100 | 34 | void probing_failed(boost::filesystem::path const& path, std::exception const& error); | ||
| 3101 | 35 | void loading_library(boost::filesystem::path const& filename); | ||
| 3102 | 36 | void loading_failed(boost::filesystem::path const& filename, std::exception const& error); | ||
| 3103 | 37 | }; | ||
| 3104 | 38 | |||
| 3105 | 39 | } | ||
| 3106 | 40 | } | ||
| 3107 | 41 | } | ||
| 3108 | 42 | |||
| 3109 | 43 | #endif // MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_ | ||
| 3110 | 0 | 44 | ||
| 3111 | === modified file 'src/server/report/null_report_factory.h' | |||
| 3112 | --- src/server/report/null_report_factory.h 2014-02-17 22:35:23 +0000 | |||
| 3113 | +++ src/server/report/null_report_factory.h 2014-08-29 01:18:58 +0000 | |||
| 3114 | @@ -35,6 +35,7 @@ | |||
| 3115 | 35 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; | 35 | std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override; |
| 3116 | 36 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; | 36 | std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override; |
| 3117 | 37 | std::shared_ptr<input::InputReport> create_input_report() override; | 37 | std::shared_ptr<input::InputReport> create_input_report() override; |
| 3118 | 38 | std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override; | ||
| 3119 | 38 | }; | 39 | }; |
| 3120 | 39 | 40 | ||
| 3121 | 40 | std::shared_ptr<compositor::CompositorReport> null_compositor_report(); | 41 | std::shared_ptr<compositor::CompositorReport> null_compositor_report(); |
| 3122 | @@ -44,7 +45,7 @@ | |||
| 3123 | 44 | std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report(); | 45 | std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report(); |
| 3124 | 45 | std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report(); | 46 | std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report(); |
| 3125 | 46 | std::shared_ptr<input::InputReport> null_input_report(); | 47 | std::shared_ptr<input::InputReport> null_input_report(); |
| 3127 | 47 | 48 | std::shared_ptr<SharedLibraryProberReport> null_shared_library_prober_report(); | |
| 3128 | 48 | } | 49 | } |
| 3129 | 49 | } | 50 | } |
| 3130 | 50 | 51 | ||
| 3131 | 51 | 52 | ||
| 3132 | === modified file 'src/server/report/report_factory.h' | |||
| 3133 | --- src/server/report/report_factory.h 2014-02-11 15:18:07 +0000 | |||
| 3134 | +++ src/server/report/report_factory.h 2014-08-29 01:18:58 +0000 | |||
| 3135 | @@ -23,6 +23,8 @@ | |||
| 3136 | 23 | 23 | ||
| 3137 | 24 | namespace mir | 24 | namespace mir |
| 3138 | 25 | { | 25 | { |
| 3139 | 26 | |||
| 3140 | 27 | class SharedLibraryProberReport; | ||
| 3141 | 26 | namespace compositor | 28 | namespace compositor |
| 3142 | 27 | { | 29 | { |
| 3143 | 28 | class CompositorReport; | 30 | class CompositorReport; |
| 3144 | @@ -59,6 +61,7 @@ | |||
| 3145 | 59 | virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0; | 61 | virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0; |
| 3146 | 60 | virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0; | 62 | virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0; |
| 3147 | 61 | virtual std::shared_ptr<input::InputReport> create_input_report() = 0; | 63 | virtual std::shared_ptr<input::InputReport> create_input_report() = 0; |
| 3148 | 64 | virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0; | ||
| 3149 | 62 | 65 | ||
| 3150 | 63 | protected: | 66 | protected: |
| 3151 | 64 | ReportFactory() = default; | 67 | ReportFactory() = default; |
| 3152 | 65 | 68 | ||
| 3153 | === modified file 'src/shared/graphics/android/mir_native_window.cpp' | |||
| 3154 | --- src/shared/graphics/android/mir_native_window.cpp 2014-08-20 23:58:45 +0000 | |||
| 3155 | +++ src/shared/graphics/android/mir_native_window.cpp 2014-08-29 01:18:58 +0000 | |||
| 3156 | @@ -20,7 +20,6 @@ | |||
| 3157 | 20 | #include "mir/graphics/android/android_driver_interpreter.h" | 20 | #include "mir/graphics/android/android_driver_interpreter.h" |
| 3158 | 21 | #include "mir/graphics/android/sync_fence.h" | 21 | #include "mir/graphics/android/sync_fence.h" |
| 3159 | 22 | 22 | ||
| 3160 | 23 | #include <iostream> | ||
| 3161 | 24 | #include <boost/exception/diagnostic_information.hpp> | 23 | #include <boost/exception/diagnostic_information.hpp> |
| 3162 | 25 | 24 | ||
| 3163 | 26 | namespace mg=mir::graphics; | 25 | namespace mg=mir::graphics; |
| 3164 | 27 | 26 | ||
| 3165 | === modified file 'src/shared/logging/CMakeLists.txt' | |||
| 3166 | --- src/shared/logging/CMakeLists.txt 2014-07-24 11:30:35 +0000 | |||
| 3167 | +++ src/shared/logging/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3168 | @@ -17,7 +17,8 @@ | |||
| 3169 | 17 | add_library(mirsharedlogging OBJECT | 17 | add_library(mirsharedlogging OBJECT |
| 3170 | 18 | dumb_console_logger.cpp | 18 | dumb_console_logger.cpp |
| 3171 | 19 | input_timestamp.cpp | 19 | input_timestamp.cpp |
| 3173 | 20 | ) | 20 | shared_library_prober_report.cpp |
| 3174 | 21 | ) | ||
| 3175 | 21 | 22 | ||
| 3176 | 22 | list(APPEND MIR_COMMON_SOURCES | 23 | list(APPEND MIR_COMMON_SOURCES |
| 3177 | 23 | $<TARGET_OBJECTS:mirsharedlogging> | 24 | $<TARGET_OBJECTS:mirsharedlogging> |
| 3178 | 24 | 25 | ||
| 3179 | === added file 'src/shared/logging/shared_library_prober_report.cpp' | |||
| 3180 | --- src/shared/logging/shared_library_prober_report.cpp 1970-01-01 00:00:00 +0000 | |||
| 3181 | +++ src/shared/logging/shared_library_prober_report.cpp 2014-08-29 01:18:58 +0000 | |||
| 3182 | @@ -0,0 +1,58 @@ | |||
| 3183 | 1 | |||
| 3184 | 2 | /* | ||
| 3185 | 3 | * Copyright © 2014 Canonical Ltd. | ||
| 3186 | 4 | * | ||
| 3187 | 5 | * This program is free software: you can redistribute it and/or modify | ||
| 3188 | 6 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 3189 | 7 | * published by the Free Software Foundation. | ||
| 3190 | 8 | * | ||
| 3191 | 9 | * This program is distributed in the hope that it will be useful, | ||
| 3192 | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3193 | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3194 | 12 | * GNU Lesser General Public License for more details. | ||
| 3195 | 13 | * | ||
| 3196 | 14 | * You should have received a copy of the GNU Lesser General Public License | ||
| 3197 | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3198 | 16 | * | ||
| 3199 | 17 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 3200 | 18 | */ | ||
| 3201 | 19 | |||
| 3202 | 20 | #include "mir/logging/shared_library_prober_report.h" | ||
| 3203 | 21 | #include "mir/logging/logger.h" | ||
| 3204 | 22 | |||
| 3205 | 23 | namespace ml = mir::logging; | ||
| 3206 | 24 | |||
| 3207 | 25 | ml::SharedLibraryProberReport::SharedLibraryProberReport(std::shared_ptr<Logger> const& logger) | ||
| 3208 | 26 | : logger{logger} | ||
| 3209 | 27 | { | ||
| 3210 | 28 | } | ||
| 3211 | 29 | |||
| 3212 | 30 | void ml::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path) | ||
| 3213 | 31 | { | ||
| 3214 | 32 | logger->log(ml::Logger::Severity::informational, | ||
| 3215 | 33 | std::string("Loading modules from: ") + path.string(), | ||
| 3216 | 34 | "Loader"); | ||
| 3217 | 35 | } | ||
| 3218 | 36 | |||
| 3219 | 37 | void ml::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error) | ||
| 3220 | 38 | { | ||
| 3221 | 39 | logger->log(ml::Logger::Severity::error, | ||
| 3222 | 40 | std::string("Failed to load libraries from path: ") + path.string() + | ||
| 3223 | 41 | " (error was:" + error.what() + ")", | ||
| 3224 | 42 | "Loader"); | ||
| 3225 | 43 | } | ||
| 3226 | 44 | |||
| 3227 | 45 | void ml::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename) | ||
| 3228 | 46 | { | ||
| 3229 | 47 | logger->log(ml::Logger::Severity::informational, | ||
| 3230 | 48 | std::string("Loading module: ") + filename.string(), | ||
| 3231 | 49 | "Loader"); | ||
| 3232 | 50 | } | ||
| 3233 | 51 | |||
| 3234 | 52 | void ml::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error) | ||
| 3235 | 53 | { | ||
| 3236 | 54 | logger->log(ml::Logger::Severity::warning, | ||
| 3237 | 55 | std::string("Failed to load module: ") + filename.string() + | ||
| 3238 | 56 | " (error was:" + error.what() + ")", | ||
| 3239 | 57 | "Loader"); | ||
| 3240 | 58 | } | ||
| 3241 | 0 | 59 | ||
| 3242 | === modified file 'src/shared/sharedlibrary/CMakeLists.txt' | |||
| 3243 | --- src/shared/sharedlibrary/CMakeLists.txt 2014-07-24 11:30:35 +0000 | |||
| 3244 | +++ src/shared/sharedlibrary/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3245 | @@ -16,13 +16,17 @@ | |||
| 3246 | 16 | 16 | ||
| 3247 | 17 | add_library(mirsharedsharedlibrary OBJECT | 17 | add_library(mirsharedsharedlibrary OBJECT |
| 3248 | 18 | shared_library.cpp | 18 | shared_library.cpp |
| 3249 | 19 | shared_library_prober.cpp | ||
| 3250 | 19 | ) | 20 | ) |
| 3251 | 20 | 21 | ||
| 3252 | 21 | list(APPEND MIR_COMMON_SOURCES | 22 | list(APPEND MIR_COMMON_SOURCES |
| 3253 | 22 | $<TARGET_OBJECTS:mirsharedsharedlibrary> | 23 | $<TARGET_OBJECTS:mirsharedsharedlibrary> |
| 3254 | 23 | ) | 24 | ) |
| 3255 | 24 | 25 | ||
| 3257 | 25 | list(APPEND MIR_COMMON_REFERENCES dl) | 26 | list(APPEND MIR_COMMON_REFERENCES |
| 3258 | 27 | dl | ||
| 3259 | 28 | ${Boost_LIBRARIES} | ||
| 3260 | 29 | ) | ||
| 3261 | 26 | 30 | ||
| 3262 | 27 | set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE) | 31 | set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE) |
| 3263 | 28 | set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE) | 32 | set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE) |
| 3264 | 29 | 33 | ||
| 3265 | === added file 'src/shared/sharedlibrary/shared_library_prober.cpp' | |||
| 3266 | --- src/shared/sharedlibrary/shared_library_prober.cpp 1970-01-01 00:00:00 +0000 | |||
| 3267 | +++ src/shared/sharedlibrary/shared_library_prober.cpp 2014-08-29 01:18:58 +0000 | |||
| 3268 | @@ -0,0 +1,63 @@ | |||
| 3269 | 1 | /* | ||
| 3270 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3271 | 3 | * | ||
| 3272 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3273 | 5 | * under the terms of the GNU Lesser General Public License version 3, | ||
| 3274 | 6 | * as published by the Free Software Foundation. | ||
| 3275 | 7 | * | ||
| 3276 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3277 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3278 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3279 | 11 | * GNU Lesser General Public License for more details. | ||
| 3280 | 12 | * | ||
| 3281 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 3282 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3283 | 15 | * | ||
| 3284 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 3285 | 17 | */ | ||
| 3286 | 18 | |||
| 3287 | 19 | #include "mir/shared_library_prober.h" | ||
| 3288 | 20 | #include "mir/shared_library.h" | ||
| 3289 | 21 | |||
| 3290 | 22 | #include <system_error> | ||
| 3291 | 23 | #include <boost/filesystem.hpp> | ||
| 3292 | 24 | |||
| 3293 | 25 | std::vector<std::shared_ptr<mir::SharedLibrary>> | ||
| 3294 | 26 | mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report) | ||
| 3295 | 27 | { | ||
| 3296 | 28 | report.probing_path(path); | ||
| 3297 | 29 | // We use the error_code overload because we want to throw a std::system_error | ||
| 3298 | 30 | boost::system::error_code ec; | ||
| 3299 | 31 | boost::filesystem::directory_iterator iterator{path, ec}; | ||
| 3300 | 32 | if (ec) | ||
| 3301 | 33 | { | ||
| 3302 | 34 | // *Of course* there's no good way to go from a boost::error_code to a std::error_code | ||
| 3303 | 35 | if (ec.category() == boost::system::system_category()) | ||
| 3304 | 36 | { | ||
| 3305 | 37 | std::system_error error{ec.value(), std::system_category()}; | ||
| 3306 | 38 | report.probing_failed(path, error); | ||
| 3307 | 39 | throw error; | ||
| 3308 | 40 | } | ||
| 3309 | 41 | else | ||
| 3310 | 42 | { | ||
| 3311 | 43 | throw std::runtime_error{"Boost error from unknown category"}; | ||
| 3312 | 44 | } | ||
| 3313 | 45 | } | ||
| 3314 | 46 | std::vector<std::shared_ptr<mir::SharedLibrary>> libraries; | ||
| 3315 | 47 | for (; iterator != boost::filesystem::directory_iterator() ; ++iterator) | ||
| 3316 | 48 | { | ||
| 3317 | 49 | if (iterator->path().extension().string() == ".so") | ||
| 3318 | 50 | { | ||
| 3319 | 51 | try | ||
| 3320 | 52 | { | ||
| 3321 | 53 | report.loading_library(iterator->path()); | ||
| 3322 | 54 | libraries.emplace_back(std::make_shared<mir::SharedLibrary>(iterator->path().string())); | ||
| 3323 | 55 | } | ||
| 3324 | 56 | catch (std::runtime_error const& err) | ||
| 3325 | 57 | { | ||
| 3326 | 58 | report.loading_failed(iterator->path(), err); | ||
| 3327 | 59 | } | ||
| 3328 | 60 | } | ||
| 3329 | 61 | } | ||
| 3330 | 62 | return libraries; | ||
| 3331 | 63 | } | ||
| 3332 | 0 | 64 | ||
| 3333 | === modified file 'src/shared/symbols.map' | |||
| 3334 | --- src/shared/symbols.map 2014-08-25 11:03:32 +0000 | |||
| 3335 | +++ src/shared/symbols.map 2014-08-29 01:18:58 +0000 | |||
| 3336 | @@ -130,12 +130,19 @@ | |||
| 3337 | 130 | mir::input::receiver::XKBMapper::update_state_and_map_event*; | 130 | mir::input::receiver::XKBMapper::update_state_and_map_event*; |
| 3338 | 131 | mir::input::receiver::XKBMapper::?XKBMapper*; | 131 | mir::input::receiver::XKBMapper::?XKBMapper*; |
| 3339 | 132 | mir::input::receiver::XKBMapper::XKBMapper*; | 132 | mir::input::receiver::XKBMapper::XKBMapper*; |
| 3340 | 133 | mir::libraries_for_path*; | ||
| 3341 | 133 | mir::logging::DumbConsoleLogger::log*; | 134 | mir::logging::DumbConsoleLogger::log*; |
| 3342 | 134 | mir::logging::input_timestamp*; | 135 | mir::logging::input_timestamp*; |
| 3343 | 135 | mir::logging::Logger::log*; | 136 | mir::logging::Logger::log*; |
| 3344 | 136 | mir::logging::Logger::?Logger*; | 137 | mir::logging::Logger::?Logger*; |
| 3345 | 137 | mir::logging::Logger::Logger*; | 138 | mir::logging::Logger::Logger*; |
| 3346 | 138 | mir::logging::Logger::operator*; | 139 | mir::logging::Logger::operator*; |
| 3347 | 140 | mir::logging::SharedLibraryProberReport::?SharedLibraryProberReport*; | ||
| 3348 | 141 | mir::logging::SharedLibraryProberReport::SharedLibraryProberReport*; | ||
| 3349 | 142 | mir::logging::SharedLibraryProberReport::probing_path*; | ||
| 3350 | 143 | mir::logging::SharedLibraryProberReport::probing_failed*; | ||
| 3351 | 144 | mir::logging::SharedLibraryProberReport::loading_library*; | ||
| 3352 | 145 | mir::logging::SharedLibraryProberReport::loading_failed*; | ||
| 3353 | 139 | mir_omnidirectional_resize_cursor_name*; | 146 | mir_omnidirectional_resize_cursor_name*; |
| 3354 | 140 | mir_open_hand_cursor_name*; | 147 | mir_open_hand_cursor_name*; |
| 3355 | 141 | mir_pointing_hand_cursor_name*; | 148 | mir_pointing_hand_cursor_name*; |
| 3356 | @@ -807,6 +814,7 @@ | |||
| 3357 | 807 | typeinfo?for?MirKeyEvent; | 814 | typeinfo?for?MirKeyEvent; |
| 3358 | 808 | typeinfo?for?mir::logging::DumbConsoleLogger; | 815 | typeinfo?for?mir::logging::DumbConsoleLogger; |
| 3359 | 809 | typeinfo?for?mir::logging::Logger; | 816 | typeinfo?for?mir::logging::Logger; |
| 3360 | 817 | typeinfo?for?mir::logging::SharedLibraryProberReport; | ||
| 3361 | 810 | typeinfo?for?MirMesaEGLNativeDisplay; | 818 | typeinfo?for?MirMesaEGLNativeDisplay; |
| 3362 | 811 | typeinfo?for?MirMesaEGLNativeSurface; | 819 | typeinfo?for?MirMesaEGLNativeSurface; |
| 3363 | 812 | typeinfo?for?MirMotionEvent; | 820 | typeinfo?for?MirMotionEvent; |
| 3364 | @@ -899,6 +907,7 @@ | |||
| 3365 | 899 | vtable?for?MirKeyEvent; | 907 | vtable?for?MirKeyEvent; |
| 3366 | 900 | vtable?for?mir::logging::DumbConsoleLogger; | 908 | vtable?for?mir::logging::DumbConsoleLogger; |
| 3367 | 901 | vtable?for?mir::logging::Logger; | 909 | vtable?for?mir::logging::Logger; |
| 3368 | 910 | vtable?for?mir::logging::SharedLibraryProberReport; | ||
| 3369 | 902 | vtable?for?MirMesaEGLNativeDisplay; | 911 | vtable?for?MirMesaEGLNativeDisplay; |
| 3370 | 903 | vtable?for?MirMesaEGLNativeSurface; | 912 | vtable?for?MirMesaEGLNativeSurface; |
| 3371 | 904 | vtable?for?MirMotionEvent; | 913 | vtable?for?MirMotionEvent; |
| 3372 | 905 | 914 | ||
| 3373 | === modified file 'tests/acceptance-tests/CMakeLists.txt' | |||
| 3374 | --- tests/acceptance-tests/CMakeLists.txt 2014-08-06 15:15:35 +0000 | |||
| 3375 | +++ tests/acceptance-tests/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3376 | @@ -90,8 +90,10 @@ | |||
| 3377 | 90 | "MIR_BUILD_ACCEPTANCE_TESTS" | 90 | "MIR_BUILD_ACCEPTANCE_TESTS" |
| 3378 | 91 | OFF) | 91 | OFF) |
| 3379 | 92 | 92 | ||
| 3380 | 93 | set (MIR_CLIENT_PLATFORM client-platform-dummy.so) | ||
| 3381 | 94 | |||
| 3382 | 93 | if (MIR_RUN_ACCEPTANCE_TESTS) | 95 | if (MIR_RUN_ACCEPTANCE_TESTS) |
| 3384 | 94 | mir_discover_tests(mir_acceptance_tests) | 96 | mir_discover_tests(mir_acceptance_tests MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_PLATFORM}) |
| 3385 | 95 | endif (MIR_RUN_ACCEPTANCE_TESTS) | 97 | endif (MIR_RUN_ACCEPTANCE_TESTS) |
| 3386 | 96 | 98 | ||
| 3387 | 97 | install( | 99 | install( |
| 3388 | 98 | 100 | ||
| 3389 | === modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp' | |||
| 3390 | --- tests/acceptance-tests/test_symbols_required_by_mesa.cpp 2014-07-30 13:19:36 +0000 | |||
| 3391 | +++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp 2014-08-29 01:18:58 +0000 | |||
| 3392 | @@ -23,9 +23,9 @@ | |||
| 3393 | 23 | 23 | ||
| 3394 | 24 | using namespace testing; | 24 | using namespace testing; |
| 3395 | 25 | 25 | ||
| 3397 | 26 | TEST(SymbolsRequiredByMesa, are_exported_by_libmirclientplatform) | 26 | TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa) |
| 3398 | 27 | { | 27 | { |
| 3400 | 28 | auto const handle = dlopen("libmirclientplatform.so", RTLD_LAZY); | 28 | auto const handle = dlopen("client-platform-mesa.so", RTLD_LAZY); |
| 3401 | 29 | ASSERT_THAT(handle, NotNull()); | 29 | ASSERT_THAT(handle, NotNull()); |
| 3402 | 30 | 30 | ||
| 3403 | 31 | auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid"); | 31 | auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid"); |
| 3404 | @@ -36,7 +36,7 @@ | |||
| 3405 | 36 | 36 | ||
| 3406 | 37 | TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics) | 37 | TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics) |
| 3407 | 38 | { | 38 | { |
| 3409 | 39 | auto const handle = dlopen("libmirplatformgraphics.so", RTLD_LAZY); | 39 | auto const handle = dlopen("platform-graphics-mesa.so", RTLD_LAZY); |
| 3410 | 40 | ASSERT_THAT(handle, NotNull()); | 40 | ASSERT_THAT(handle, NotNull()); |
| 3411 | 41 | 41 | ||
| 3412 | 42 | auto const sym = dlsym(handle, "mir_server_mesa_egl_native_display_is_valid"); | 42 | auto const sym = dlsym(handle, "mir_server_mesa_egl_native_display_is_valid"); |
| 3413 | 43 | 43 | ||
| 3414 | === modified file 'tests/integration-tests/CMakeLists.txt' | |||
| 3415 | --- tests/integration-tests/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 3416 | +++ tests/integration-tests/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3417 | @@ -71,6 +71,15 @@ | |||
| 3418 | 71 | ${GTEST_BOTH_LIBRARIES} | 71 | ${GTEST_BOTH_LIBRARIES} |
| 3419 | 72 | ${GMOCK_LIBRARY} | 72 | ${GMOCK_LIBRARY} |
| 3420 | 73 | ${GMOCK_MAIN_LIBRARY} | 73 | ${GMOCK_MAIN_LIBRARY} |
| 3421 | 74 | # Mesa platform dependencies | ||
| 3422 | 75 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | ||
| 3423 | 76 | ${GBM_LDFLAGS} ${GBM_LIBRARIES} | ||
| 3424 | 77 | # Android platform dependencies | ||
| 3425 | 78 | ${LIBHARDWARE_LIBRARIES} | ||
| 3426 | 79 | ${ANDROID_PROPERTIES_LIBRARIES} | ||
| 3427 | 80 | # Shared platform dependencies | ||
| 3428 | 81 | ${EGL_LDFLAGS} ${EGL_LIBRARIES} | ||
| 3429 | 82 | ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES} | ||
| 3430 | 74 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. | 83 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. |
| 3431 | 75 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | 84 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} |
| 3432 | 76 | ${GBM_LDFLAGS} ${GBM_LIBRARIES} | 85 | ${GBM_LDFLAGS} ${GBM_LIBRARIES} |
| 3433 | @@ -79,7 +88,7 @@ | |||
| 3434 | 79 | ${MIR_SERVER_REFERENCES} | 88 | ${MIR_SERVER_REFERENCES} |
| 3435 | 80 | ) | 89 | ) |
| 3436 | 81 | 90 | ||
| 3438 | 82 | if (MIR_TEST_PLATFORM STREQUAL "android") | 91 | if (MIR_BUILD_PLATFORM_ANDROID) |
| 3439 | 83 | target_link_libraries(mir_integration_tests | 92 | target_link_libraries(mir_integration_tests |
| 3440 | 84 | mirsharedandroid | 93 | mirsharedandroid |
| 3441 | 85 | ${ANDROID_PROPERTIES_LDFLAGS} | 94 | ${ANDROID_PROPERTIES_LDFLAGS} |
| 3442 | @@ -93,8 +102,18 @@ | |||
| 3443 | 93 | "MIR_BUILD_INTEGRATION_TESTS" | 102 | "MIR_BUILD_INTEGRATION_TESTS" |
| 3444 | 94 | OFF) | 103 | OFF) |
| 3445 | 95 | 104 | ||
| 3446 | 105 | set (MIR_CLIENT_MODULE "client-platform-dummy.so") | ||
| 3447 | 106 | |||
| 3448 | 107 | if (MIR_TEST_PLATFORM STREQUAL "android") | ||
| 3449 | 108 | # Android platform integration tests have Android-specific tests | ||
| 3450 | 109 | # requiring a real platform | ||
| 3451 | 110 | set (MIR_CLIENT_MODULE "client-platform-android.so") | ||
| 3452 | 111 | endif() | ||
| 3453 | 112 | |||
| 3454 | 96 | if (MIR_RUN_INTEGRATION_TESTS) | 113 | if (MIR_RUN_INTEGRATION_TESTS) |
| 3456 | 97 | mir_discover_tests(mir_integration_tests) | 114 | mir_discover_tests(mir_integration_tests |
| 3457 | 115 | MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_MODULE} | ||
| 3458 | 116 | ) | ||
| 3459 | 98 | endif (MIR_RUN_INTEGRATION_TESTS) | 117 | endif (MIR_RUN_INTEGRATION_TESTS) |
| 3460 | 99 | 118 | ||
| 3461 | 100 | install( | 119 | install( |
| 3462 | 101 | 120 | ||
| 3463 | === modified file 'tests/mir_test_doubles/CMakeLists.txt' | |||
| 3464 | --- tests/mir_test_doubles/CMakeLists.txt 2014-08-15 15:04:40 +0000 | |||
| 3465 | +++ tests/mir_test_doubles/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3466 | @@ -23,16 +23,19 @@ | |||
| 3467 | 23 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp | 23 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp |
| 3468 | 24 | ) | 24 | ) |
| 3469 | 25 | 25 | ||
| 3480 | 26 | if (MIR_TEST_PLATFORM STREQUAL "mesa") | 26 | if (MIR_BUILD_PLATFORM_MESA) |
| 3481 | 27 | include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}) | 27 | include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}) |
| 3482 | 28 | list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS | 28 | list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS |
| 3483 | 29 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp | 29 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp |
| 3484 | 30 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp | 30 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp |
| 3485 | 31 | ) | 31 | ) |
| 3486 | 32 | elseif (MIR_TEST_PLATFORM STREQUAL "android") | 32 | endif() |
| 3487 | 33 | list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS | 33 | |
| 3488 | 34 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp | 34 | if (MIR_BUILD_PLATFORM_ANDROID) |
| 3489 | 35 | ) | 35 | include_directories(${ANDROID_HEADERS_INCLUDE_DIRS}) |
| 3490 | 36 | list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS | ||
| 3491 | 37 | ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp | ||
| 3492 | 38 | ) | ||
| 3493 | 36 | endif() | 39 | endif() |
| 3494 | 37 | 40 | ||
| 3495 | 38 | add_library( | 41 | add_library( |
| 3496 | 39 | 42 | ||
| 3497 | === modified file 'tests/mir_test_framework/CMakeLists.txt' | |||
| 3498 | --- tests/mir_test_framework/CMakeLists.txt 2014-08-15 15:04:40 +0000 | |||
| 3499 | +++ tests/mir_test_framework/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3500 | @@ -3,6 +3,7 @@ | |||
| 3501 | 3 | ${GLESv2_INCLUDE_DIRS} | 3 | ${GLESv2_INCLUDE_DIRS} |
| 3502 | 4 | ${CMAKE_SOURCE_DIR} | 4 | ${CMAKE_SOURCE_DIR} |
| 3503 | 5 | ${UMOCKDEV_INCLUDE_DIRS} | 5 | ${UMOCKDEV_INCLUDE_DIRS} |
| 3504 | 6 | ${ANDROID_HEADERS_INCLUDE_DIRS} | ||
| 3505 | 6 | ) | 7 | ) |
| 3506 | 7 | 8 | ||
| 3507 | 8 | set( | 9 | set( |
| 3508 | @@ -23,6 +24,7 @@ | |||
| 3509 | 23 | using_stub_client_platform.cpp | 24 | using_stub_client_platform.cpp |
| 3510 | 24 | udev_environment.cpp | 25 | udev_environment.cpp |
| 3511 | 25 | declarative_placement_strategy.cpp | 26 | declarative_placement_strategy.cpp |
| 3512 | 27 | stub_client_platform_factory.cpp | ||
| 3513 | 26 | ) | 28 | ) |
| 3514 | 27 | 29 | ||
| 3515 | 28 | list(APPEND TEST_FRAMEWORK_SRCS | 30 | list(APPEND TEST_FRAMEWORK_SRCS |
| 3516 | @@ -52,6 +54,42 @@ | |||
| 3517 | 52 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. | 54 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. |
| 3518 | 53 | ) | 55 | ) |
| 3519 | 54 | 56 | ||
| 3520 | 57 | set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-client.map) | ||
| 3521 | 58 | |||
| 3522 | 59 | add_library( | ||
| 3523 | 60 | mirclientplatformstub MODULE | ||
| 3524 | 61 | |||
| 3525 | 62 | stub_client_platform_module.cpp | ||
| 3526 | 63 | ) | ||
| 3527 | 64 | |||
| 3528 | 65 | target_link_libraries( | ||
| 3529 | 66 | mirclientplatformstub | ||
| 3530 | 67 | |||
| 3531 | 68 | mir-test-framework | ||
| 3532 | 69 | ) | ||
| 3533 | 70 | |||
| 3534 | 71 | set_target_properties( | ||
| 3535 | 72 | mirclientplatformstub PROPERTIES; | ||
| 3536 | 73 | OUTPUT_NAME client-platform-dummy | ||
| 3537 | 74 | PREFIX "" | ||
| 3538 | 75 | LINK_FLAGS "-Wl,--version-script,${symbol_map}" | ||
| 3539 | 76 | ) | ||
| 3540 | 77 | |||
| 3541 | 78 | set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-server.map) | ||
| 3542 | 79 | add_library( | ||
| 3543 | 80 | mirplatformgraphicsstub MODULE | ||
| 3544 | 81 | |||
| 3545 | 82 | platform_graphics_dummy.cpp | ||
| 3546 | 83 | ) | ||
| 3547 | 84 | |||
| 3548 | 85 | set_target_properties( | ||
| 3549 | 86 | mirplatformgraphicsstub PROPERTIES; | ||
| 3550 | 87 | OUTPUT_NAME platform-graphics-dummy | ||
| 3551 | 88 | PREFIX "" | ||
| 3552 | 89 | LINK_FLAGS "-Wl,--version-script,${server_symbol_map}" | ||
| 3553 | 90 | ) | ||
| 3554 | 91 | |||
| 3555 | 92 | |||
| 3556 | 55 | add_custom_command(TARGET mir-test-framework POST_BUILD | 93 | add_custom_command(TARGET mir-test-framework POST_BUILD |
| 3557 | 56 | COMMAND ${CMAKE_COMMAND} -E copy_directory | 94 | COMMAND ${CMAKE_COMMAND} -E copy_directory |
| 3558 | 57 | ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings | 95 | ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings |
| 3559 | 58 | 96 | ||
| 3560 | === modified file 'tests/mir_test_framework/executable_path.cpp' | |||
| 3561 | --- tests/mir_test_framework/executable_path.cpp 2014-07-29 12:28:04 +0000 | |||
| 3562 | +++ tests/mir_test_framework/executable_path.cpp 2014-08-29 01:18:58 +0000 | |||
| 3563 | @@ -38,3 +38,8 @@ | |||
| 3564 | 38 | buf[tmp] = '\0'; | 38 | buf[tmp] = '\0'; |
| 3565 | 39 | return dirname(buf); | 39 | return dirname(buf); |
| 3566 | 40 | } | 40 | } |
| 3567 | 41 | |||
| 3568 | 42 | std::string mir_test_framework::library_path() | ||
| 3569 | 43 | { | ||
| 3570 | 44 | return executable_path() + "/../lib"; | ||
| 3571 | 45 | } | ||
| 3572 | 41 | 46 | ||
| 3573 | === added file 'tests/mir_test_framework/platform_graphics_dummy.cpp' | |||
| 3574 | --- tests/mir_test_framework/platform_graphics_dummy.cpp 1970-01-01 00:00:00 +0000 | |||
| 3575 | +++ tests/mir_test_framework/platform_graphics_dummy.cpp 2014-08-29 01:18:58 +0000 | |||
| 3576 | @@ -0,0 +1,33 @@ | |||
| 3577 | 1 | /* | ||
| 3578 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3579 | 3 | * | ||
| 3580 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3581 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 3582 | 6 | * as published by the Free Software Foundation. | ||
| 3583 | 7 | * | ||
| 3584 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3585 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3586 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3587 | 11 | * GNU General Public License for more details. | ||
| 3588 | 12 | * | ||
| 3589 | 13 | * You should have received a copy of the GNU General Public License | ||
| 3590 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3591 | 15 | * | ||
| 3592 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>> | ||
| 3593 | 17 | */ | ||
| 3594 | 18 | |||
| 3595 | 19 | #include "mir/graphics/platform.h" | ||
| 3596 | 20 | |||
| 3597 | 21 | extern "C" mir::graphics::PlatformPriority probe_platform() | ||
| 3598 | 22 | { | ||
| 3599 | 23 | return mir::graphics::supported; | ||
| 3600 | 24 | } | ||
| 3601 | 25 | |||
| 3602 | 26 | mir::graphics::ModuleProperties const description { | ||
| 3603 | 27 | "dummy" | ||
| 3604 | 28 | }; | ||
| 3605 | 29 | |||
| 3606 | 30 | extern "C" mir::graphics::ModuleProperties const* describe_module() | ||
| 3607 | 31 | { | ||
| 3608 | 32 | return &description; | ||
| 3609 | 33 | } | ||
| 3610 | 0 | 34 | ||
| 3611 | === added file 'tests/mir_test_framework/stub_client_platform_factory.cpp' | |||
| 3612 | --- tests/mir_test_framework/stub_client_platform_factory.cpp 1970-01-01 00:00:00 +0000 | |||
| 3613 | +++ tests/mir_test_framework/stub_client_platform_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 3614 | @@ -0,0 +1,143 @@ | |||
| 3615 | 1 | /* | ||
| 3616 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3617 | 3 | * | ||
| 3618 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3619 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 3620 | 6 | * as published by the Free Software Foundation. | ||
| 3621 | 7 | * | ||
| 3622 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3623 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3624 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3625 | 11 | * GNU General Public License for more details. | ||
| 3626 | 12 | * | ||
| 3627 | 13 | * You should have received a copy of the GNU General Public License | ||
| 3628 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3629 | 15 | * | ||
| 3630 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 3631 | 17 | */ | ||
| 3632 | 18 | |||
| 3633 | 19 | #include "mir_test_framework/stub_client_platform_factory.h" | ||
| 3634 | 20 | #include "src/client/client_buffer_factory.h" | ||
| 3635 | 21 | #include "src/client/client_buffer.h" | ||
| 3636 | 22 | #include "src/client/client_platform.h" | ||
| 3637 | 23 | |||
| 3638 | 24 | #include <string.h> | ||
| 3639 | 25 | |||
| 3640 | 26 | namespace mcl = mir::client; | ||
| 3641 | 27 | namespace geom = mir::geometry; | ||
| 3642 | 28 | namespace mtf = mir_test_framework; | ||
| 3643 | 29 | |||
| 3644 | 30 | namespace | ||
| 3645 | 31 | { | ||
| 3646 | 32 | class StubClientBuffer : public mcl::ClientBuffer | ||
| 3647 | 33 | { | ||
| 3648 | 34 | public: | ||
| 3649 | 35 | StubClientBuffer(std::shared_ptr<MirBufferPackage> const& package) | ||
| 3650 | 36 | { | ||
| 3651 | 37 | static_cast<void>(package); | ||
| 3652 | 38 | #ifndef ANDROID | ||
| 3653 | 39 | native = package; | ||
| 3654 | 40 | #endif | ||
| 3655 | 41 | } | ||
| 3656 | 42 | |||
| 3657 | 43 | std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write() | ||
| 3658 | 44 | { | ||
| 3659 | 45 | return nullptr; | ||
| 3660 | 46 | } | ||
| 3661 | 47 | |||
| 3662 | 48 | geom::Size size() const | ||
| 3663 | 49 | { | ||
| 3664 | 50 | return geom::Size{}; | ||
| 3665 | 51 | } | ||
| 3666 | 52 | |||
| 3667 | 53 | geom::Stride stride() const | ||
| 3668 | 54 | { | ||
| 3669 | 55 | return geom::Stride{}; | ||
| 3670 | 56 | } | ||
| 3671 | 57 | |||
| 3672 | 58 | MirPixelFormat pixel_format() const | ||
| 3673 | 59 | { | ||
| 3674 | 60 | return mir_pixel_format_abgr_8888; | ||
| 3675 | 61 | } | ||
| 3676 | 62 | |||
| 3677 | 63 | uint32_t age() const | ||
| 3678 | 64 | { | ||
| 3679 | 65 | return 0; | ||
| 3680 | 66 | } | ||
| 3681 | 67 | void increment_age() | ||
| 3682 | 68 | { | ||
| 3683 | 69 | } | ||
| 3684 | 70 | void mark_as_submitted() | ||
| 3685 | 71 | { | ||
| 3686 | 72 | } | ||
| 3687 | 73 | std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const | ||
| 3688 | 74 | { | ||
| 3689 | 75 | #ifdef ANDROID | ||
| 3690 | 76 | return nullptr; | ||
| 3691 | 77 | #else | ||
| 3692 | 78 | return native; | ||
| 3693 | 79 | #endif | ||
| 3694 | 80 | } | ||
| 3695 | 81 | void update_from(MirBufferPackage const& package) override | ||
| 3696 | 82 | { | ||
| 3697 | 83 | static_cast<void>(package); | ||
| 3698 | 84 | #ifndef ANDROID | ||
| 3699 | 85 | ::memcpy(native.get(), &package, sizeof(package)); | ||
| 3700 | 86 | #endif | ||
| 3701 | 87 | } | ||
| 3702 | 88 | private: | ||
| 3703 | 89 | #ifndef ANDROID | ||
| 3704 | 90 | std::shared_ptr<mir::graphics::NativeBuffer> native; | ||
| 3705 | 91 | #endif | ||
| 3706 | 92 | }; | ||
| 3707 | 93 | |||
| 3708 | 94 | struct StubClientBufferFactory : public mcl::ClientBufferFactory | ||
| 3709 | 95 | { | ||
| 3710 | 96 | std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package, | ||
| 3711 | 97 | geom::Size, MirPixelFormat) | ||
| 3712 | 98 | { | ||
| 3713 | 99 | return std::make_shared<StubClientBuffer>(package); | ||
| 3714 | 100 | } | ||
| 3715 | 101 | }; | ||
| 3716 | 102 | |||
| 3717 | 103 | struct StubClientPlatform : public mcl::ClientPlatform | ||
| 3718 | 104 | { | ||
| 3719 | 105 | MirPlatformType platform_type() const | ||
| 3720 | 106 | { | ||
| 3721 | 107 | return mir_platform_type_gbm; | ||
| 3722 | 108 | } | ||
| 3723 | 109 | |||
| 3724 | 110 | std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory() | ||
| 3725 | 111 | { | ||
| 3726 | 112 | return std::make_shared<StubClientBufferFactory>(); | ||
| 3727 | 113 | } | ||
| 3728 | 114 | |||
| 3729 | 115 | std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*) | ||
| 3730 | 116 | { | ||
| 3731 | 117 | auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu); | ||
| 3732 | 118 | return std::make_shared<EGLNativeWindowType>(fake_window); | ||
| 3733 | 119 | } | ||
| 3734 | 120 | |||
| 3735 | 121 | std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() | ||
| 3736 | 122 | { | ||
| 3737 | 123 | auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu); | ||
| 3738 | 124 | return std::make_shared<EGLNativeDisplayType>(fake_display); | ||
| 3739 | 125 | } | ||
| 3740 | 126 | |||
| 3741 | 127 | MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const | ||
| 3742 | 128 | { | ||
| 3743 | 129 | static_cast<void>(buf); | ||
| 3744 | 130 | #ifndef ANDROID | ||
| 3745 | 131 | return buf; | ||
| 3746 | 132 | #else | ||
| 3747 | 133 | return nullptr; | ||
| 3748 | 134 | #endif | ||
| 3749 | 135 | } | ||
| 3750 | 136 | }; | ||
| 3751 | 137 | } | ||
| 3752 | 138 | |||
| 3753 | 139 | std::shared_ptr<mcl::ClientPlatform> | ||
| 3754 | 140 | mtf::StubClientPlatformFactory::create_client_platform(mcl::ClientContext*) | ||
| 3755 | 141 | { | ||
| 3756 | 142 | return std::make_shared<StubClientPlatform>(); | ||
| 3757 | 143 | } | ||
| 3758 | 0 | 144 | ||
| 3759 | === added file 'tests/mir_test_framework/stub_client_platform_module.cpp' | |||
| 3760 | --- tests/mir_test_framework/stub_client_platform_module.cpp 1970-01-01 00:00:00 +0000 | |||
| 3761 | +++ tests/mir_test_framework/stub_client_platform_module.cpp 2014-08-29 01:18:58 +0000 | |||
| 3762 | @@ -0,0 +1,35 @@ | |||
| 3763 | 1 | /* | ||
| 3764 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 3765 | 3 | * | ||
| 3766 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 3767 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 3768 | 6 | * as published by the Free Software Foundation. | ||
| 3769 | 7 | * | ||
| 3770 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 3771 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 3772 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 3773 | 11 | * GNU General Public License for more details. | ||
| 3774 | 12 | * | ||
| 3775 | 13 | * You should have received a copy of the GNU General Public License | ||
| 3776 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 3777 | 15 | * | ||
| 3778 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>> | ||
| 3779 | 17 | */ | ||
| 3780 | 18 | |||
| 3781 | 19 | #include "src/client/client_platform_factory.h" | ||
| 3782 | 20 | |||
| 3783 | 21 | #include "mir_test_framework/stub_client_platform_factory.h" | ||
| 3784 | 22 | #include <memory> | ||
| 3785 | 23 | |||
| 3786 | 24 | namespace mtf = mir_test_framework; | ||
| 3787 | 25 | namespace mcl = mir::client; | ||
| 3788 | 26 | |||
| 3789 | 27 | extern "C" std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext* context) | ||
| 3790 | 28 | { | ||
| 3791 | 29 | return mtf::StubClientPlatformFactory{}.create_client_platform(context); | ||
| 3792 | 30 | } | ||
| 3793 | 31 | |||
| 3794 | 32 | extern "C" bool is_appropriate_module(mcl::ClientContext* /*context*/) | ||
| 3795 | 33 | { | ||
| 3796 | 34 | return true; | ||
| 3797 | 35 | } | ||
| 3798 | 0 | 36 | ||
| 3799 | === added file 'tests/mir_test_framework/symbols-client.map' | |||
| 3800 | --- tests/mir_test_framework/symbols-client.map 1970-01-01 00:00:00 +0000 | |||
| 3801 | +++ tests/mir_test_framework/symbols-client.map 2014-08-29 01:18:58 +0000 | |||
| 3802 | @@ -0,0 +1,7 @@ | |||
| 3803 | 1 | MIR_CLIENTPLATFORM_1 { | ||
| 3804 | 2 | global: | ||
| 3805 | 3 | create_client_platform; | ||
| 3806 | 4 | is_appropriate_module; | ||
| 3807 | 5 | local: | ||
| 3808 | 6 | *; | ||
| 3809 | 7 | }; | ||
| 3810 | 0 | 8 | ||
| 3811 | === added file 'tests/mir_test_framework/symbols-server.map' | |||
| 3812 | --- tests/mir_test_framework/symbols-server.map 1970-01-01 00:00:00 +0000 | |||
| 3813 | +++ tests/mir_test_framework/symbols-server.map 2014-08-29 01:18:58 +0000 | |||
| 3814 | @@ -0,0 +1,10 @@ | |||
| 3815 | 1 | MIR_GRAPHICS_PLATFORM_1 { | ||
| 3816 | 2 | global: | ||
| 3817 | 3 | add_platform_options; | ||
| 3818 | 4 | create_platform; | ||
| 3819 | 5 | create_native_platform; | ||
| 3820 | 6 | probe_platform; | ||
| 3821 | 7 | describe_module; | ||
| 3822 | 8 | local: | ||
| 3823 | 9 | *; | ||
| 3824 | 10 | }; | ||
| 3825 | 0 | 11 | ||
| 3826 | === modified file 'tests/mir_test_framework/testing_client_options.cpp' | |||
| 3827 | --- tests/mir_test_framework/testing_client_options.cpp 2014-07-14 06:49:52 +0000 | |||
| 3828 | +++ tests/mir_test_framework/testing_client_options.cpp 2014-08-29 01:18:58 +0000 | |||
| 3829 | @@ -16,112 +16,12 @@ | |||
| 3830 | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> | 16 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> |
| 3831 | 17 | */ | 17 | */ |
| 3832 | 18 | 18 | ||
| 3833 | 19 | #include "mir_test_framework/testing_client_configuration.h" | ||
| 3834 | 20 | #include "mir_test_framework/stub_client_connection_configuration.h" | 19 | #include "mir_test_framework/stub_client_connection_configuration.h" |
| 3835 | 21 | #include "mir/options/program_option.h" | ||
| 3836 | 22 | #include "src/client/default_connection_configuration.h" | 20 | #include "src/client/default_connection_configuration.h" |
| 3842 | 23 | #include "src/client/client_platform_factory.h" | 21 | #include "mir_test_framework/stub_client_platform_factory.h" |
| 3838 | 24 | #include "src/client/client_buffer_factory.h" | ||
| 3839 | 25 | #include "src/client/client_buffer.h" | ||
| 3840 | 26 | #include "src/client/client_platform.h" | ||
| 3841 | 27 | #include "src/client/mir_connection.h" | ||
| 3843 | 28 | 22 | ||
| 3844 | 29 | namespace mcl = mir::client; | 23 | namespace mcl = mir::client; |
| 3940 | 30 | namespace mtf=mir_test_framework; | 24 | namespace mtf = mir_test_framework; |
| 3846 | 31 | namespace geom = mir::geometry; | ||
| 3847 | 32 | |||
| 3848 | 33 | |||
| 3849 | 34 | namespace | ||
| 3850 | 35 | { | ||
| 3851 | 36 | class StubClientBuffer : public mcl::ClientBuffer | ||
| 3852 | 37 | { | ||
| 3853 | 38 | std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write() | ||
| 3854 | 39 | { | ||
| 3855 | 40 | return nullptr; | ||
| 3856 | 41 | } | ||
| 3857 | 42 | |||
| 3858 | 43 | geom::Size size() const | ||
| 3859 | 44 | { | ||
| 3860 | 45 | return geom::Size{}; | ||
| 3861 | 46 | } | ||
| 3862 | 47 | |||
| 3863 | 48 | geom::Stride stride() const | ||
| 3864 | 49 | { | ||
| 3865 | 50 | return geom::Stride{}; | ||
| 3866 | 51 | } | ||
| 3867 | 52 | |||
| 3868 | 53 | MirPixelFormat pixel_format() const | ||
| 3869 | 54 | { | ||
| 3870 | 55 | return mir_pixel_format_abgr_8888; | ||
| 3871 | 56 | } | ||
| 3872 | 57 | |||
| 3873 | 58 | uint32_t age() const | ||
| 3874 | 59 | { | ||
| 3875 | 60 | return 0; | ||
| 3876 | 61 | } | ||
| 3877 | 62 | void increment_age() | ||
| 3878 | 63 | { | ||
| 3879 | 64 | } | ||
| 3880 | 65 | void mark_as_submitted() | ||
| 3881 | 66 | { | ||
| 3882 | 67 | } | ||
| 3883 | 68 | std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const | ||
| 3884 | 69 | { | ||
| 3885 | 70 | return nullptr; | ||
| 3886 | 71 | } | ||
| 3887 | 72 | void update_from(MirBufferPackage const&) override | ||
| 3888 | 73 | { | ||
| 3889 | 74 | } | ||
| 3890 | 75 | }; | ||
| 3891 | 76 | |||
| 3892 | 77 | struct StubClientBufferFactory : public mcl::ClientBufferFactory | ||
| 3893 | 78 | { | ||
| 3894 | 79 | std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const&, | ||
| 3895 | 80 | geom::Size, MirPixelFormat) | ||
| 3896 | 81 | { | ||
| 3897 | 82 | return std::make_shared<StubClientBuffer>(); | ||
| 3898 | 83 | } | ||
| 3899 | 84 | }; | ||
| 3900 | 85 | |||
| 3901 | 86 | struct StubClientPlatform : public mcl::ClientPlatform | ||
| 3902 | 87 | { | ||
| 3903 | 88 | MirPlatformType platform_type() const | ||
| 3904 | 89 | { | ||
| 3905 | 90 | return mir_platform_type_gbm; | ||
| 3906 | 91 | } | ||
| 3907 | 92 | |||
| 3908 | 93 | std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory() | ||
| 3909 | 94 | { | ||
| 3910 | 95 | return std::make_shared<StubClientBufferFactory>(); | ||
| 3911 | 96 | } | ||
| 3912 | 97 | |||
| 3913 | 98 | std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*) | ||
| 3914 | 99 | { | ||
| 3915 | 100 | auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu); | ||
| 3916 | 101 | return std::make_shared<EGLNativeWindowType>(fake_window); | ||
| 3917 | 102 | } | ||
| 3918 | 103 | |||
| 3919 | 104 | std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() | ||
| 3920 | 105 | { | ||
| 3921 | 106 | auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu); | ||
| 3922 | 107 | return std::make_shared<EGLNativeDisplayType>(fake_display); | ||
| 3923 | 108 | } | ||
| 3924 | 109 | |||
| 3925 | 110 | MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer*) const | ||
| 3926 | 111 | { | ||
| 3927 | 112 | return nullptr; | ||
| 3928 | 113 | } | ||
| 3929 | 114 | }; | ||
| 3930 | 115 | |||
| 3931 | 116 | struct StubClientPlatformFactory : public mcl::ClientPlatformFactory | ||
| 3932 | 117 | { | ||
| 3933 | 118 | std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext*) | ||
| 3934 | 119 | { | ||
| 3935 | 120 | return std::make_shared<StubClientPlatform>(); | ||
| 3936 | 121 | } | ||
| 3937 | 122 | }; | ||
| 3938 | 123 | |||
| 3939 | 124 | } | ||
| 3941 | 125 | 25 | ||
| 3942 | 126 | mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file) | 26 | mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file) |
| 3943 | 127 | : DefaultConnectionConfiguration(socket_file) | 27 | : DefaultConnectionConfiguration(socket_file) |
| 3944 | 128 | 28 | ||
| 3945 | === modified file 'tests/unit-tests/CMakeLists.txt' | |||
| 3946 | --- tests/unit-tests/CMakeLists.txt 2014-08-26 09:27:49 +0000 | |||
| 3947 | +++ tests/unit-tests/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 3948 | @@ -2,7 +2,23 @@ | |||
| 3949 | 2 | 2 | ||
| 3950 | 3 | add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/") | 3 | add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/") |
| 3951 | 4 | 4 | ||
| 3953 | 5 | include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}) | 5 | if (MIR_BUILD_PLATFORM_ANDROID) |
| 3954 | 6 | add_definitions(-DMIR_BUILD_PLATFORM_ANDROID) | ||
| 3955 | 7 | endif() | ||
| 3956 | 8 | |||
| 3957 | 9 | if (MIR_BUILD_PLATFORM_MESA) | ||
| 3958 | 10 | add_definitions(-DMIR_BUILD_PLATFORM_MESA) | ||
| 3959 | 11 | endif() | ||
| 3960 | 12 | |||
| 3961 | 13 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") | ||
| 3962 | 14 | |||
| 3963 | 15 | include_directories( | ||
| 3964 | 16 | ${ANDROID_HEADERS_INCLUDE_DIRS} | ||
| 3965 | 17 | ${DRM_INCLUDE_DIRS} | ||
| 3966 | 18 | ${GBM_INCLUDE_DIRS} | ||
| 3967 | 19 | ${UMOCKDEV_INCLUDE_DIRS} | ||
| 3968 | 20 | ${CMAKE_SOURCE_DIR} | ||
| 3969 | 21 | ) | ||
| 3970 | 6 | # TODO: Aim to remove | 22 | # TODO: Aim to remove |
| 3971 | 7 | include_directories(${MIR_XCURSOR_INCLUDE_DIRECTORIES}) | 23 | include_directories(${MIR_XCURSOR_INCLUDE_DIRECTORIES}) |
| 3972 | 8 | 24 | ||
| 3973 | @@ -19,8 +35,10 @@ | |||
| 3974 | 19 | test_thread_name.cpp | 35 | test_thread_name.cpp |
| 3975 | 20 | test_default_emergency_cleanup.cpp | 36 | test_default_emergency_cleanup.cpp |
| 3976 | 21 | test_basic_observers.cpp | 37 | test_basic_observers.cpp |
| 3977 | 38 | test_shared_library_prober.cpp | ||
| 3978 | 22 | test_fatal.cpp | 39 | test_fatal.cpp |
| 3979 | 23 | test_fd.cpp | 40 | test_fd.cpp |
| 3980 | 41 | test_shared_library_prober.cpp | ||
| 3981 | 24 | ) | 42 | ) |
| 3982 | 25 | 43 | ||
| 3983 | 26 | add_subdirectory(options/) | 44 | add_subdirectory(options/) |
| 3984 | @@ -71,6 +89,15 @@ | |||
| 3985 | 71 | ${GMOCK_MAIN_LIBRARY} | 89 | ${GMOCK_MAIN_LIBRARY} |
| 3986 | 72 | ${Boost_LIBRARIES} | 90 | ${Boost_LIBRARIES} |
| 3987 | 73 | ${UMOCKDEV_LIBRARIES} | 91 | ${UMOCKDEV_LIBRARIES} |
| 3988 | 92 | # Mesa platform dependencies | ||
| 3989 | 93 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | ||
| 3990 | 94 | ${GBM_LDFLAGS} ${GBM_LIBRARIES} | ||
| 3991 | 95 | # Android platform dependencies | ||
| 3992 | 96 | ${LIBHARDWARE_LIBRARIES} | ||
| 3993 | 97 | ${ANDROID_PROPERTIES_LIBRARIES} | ||
| 3994 | 98 | # Shared platform dependencies | ||
| 3995 | 99 | ${EGL_LDFLAGS} ${EGL_LIBRARIES} | ||
| 3996 | 100 | ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES} | ||
| 3997 | 74 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. | 101 | ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. |
| 3998 | 75 | ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES} | 102 | ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES} |
| 3999 | 76 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} | 103 | ${DRM_LDFLAGS} ${DRM_LIBRARIES} |
| 4000 | @@ -79,7 +106,7 @@ | |||
| 4001 | 79 | ${MIR_SERVER_REFERENCES} | 106 | ${MIR_SERVER_REFERENCES} |
| 4002 | 80 | ) | 107 | ) |
| 4003 | 81 | 108 | ||
| 4005 | 82 | if (MIR_TEST_PLATFORM STREQUAL "android") | 109 | if (MIR_BUILD_PLATFORM_ANDROID) |
| 4006 | 83 | target_link_libraries(mir_unit_tests | 110 | target_link_libraries(mir_unit_tests |
| 4007 | 84 | mirsharedandroid | 111 | mirsharedandroid |
| 4008 | 85 | ${ANDROID_PROPERTIES_LDFLAGS} | 112 | ${ANDROID_PROPERTIES_LDFLAGS} |
| 4009 | @@ -96,11 +123,23 @@ | |||
| 4010 | 96 | "MIR_BUILD_UNIT_TESTS" | 123 | "MIR_BUILD_UNIT_TESTS" |
| 4011 | 97 | OFF) | 124 | OFF) |
| 4012 | 98 | 125 | ||
| 4013 | 126 | set (MIR_CLIENT_PLATFORM client-platform-dummy.so) | ||
| 4014 | 127 | |||
| 4015 | 99 | if (MIR_RUN_UNIT_TESTS) | 128 | if (MIR_RUN_UNIT_TESTS) |
| 4017 | 100 | mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0 G_SLICE=always-malloc G_DEBUG=gc-friendly) | 129 | mir_discover_tests(mir_unit_tests |
| 4018 | 130 | LD_PRELOAD=libumockdev-preload.so.0 | ||
| 4019 | 131 | G_SLICE=always-malloc | ||
| 4020 | 132 | G_DEBUG=gc-friendly | ||
| 4021 | 133 | MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_PLATFORM}) | ||
| 4022 | 101 | endif (MIR_RUN_UNIT_TESTS) | 134 | endif (MIR_RUN_UNIT_TESTS) |
| 4023 | 102 | 135 | ||
| 4024 | 103 | install( | 136 | install( |
| 4025 | 104 | TARGETS mir_unit_tests | 137 | TARGETS mir_unit_tests |
| 4026 | 105 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 138 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 4027 | 106 | ) | 139 | ) |
| 4028 | 140 | |||
| 4029 | 141 | add_custom_command(TARGET mir_unit_tests POST_BUILD | ||
| 4030 | 142 | COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
| 4031 | 143 | ${CMAKE_CURRENT_SOURCE_DIR}/test_data ${CMAKE_BINARY_DIR}/bin/test_data | ||
| 4032 | 144 | COMMENT "Copying test data to build dir..." | ||
| 4033 | 145 | ) | ||
| 4034 | 107 | 146 | ||
| 4035 | === modified file 'tests/unit-tests/client/CMakeLists.txt' | |||
| 4036 | --- tests/unit-tests/client/CMakeLists.txt 2014-07-30 15:25:54 +0000 | |||
| 4037 | +++ tests/unit-tests/client/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 4038 | @@ -12,6 +12,7 @@ | |||
| 4039 | 12 | ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_rpc_channel.cpp | 12 | ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_rpc_channel.cpp |
| 4040 | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp |
| 4041 | 14 | ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp | 14 | ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp |
| 4042 | 15 | ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp | ||
| 4043 | 15 | ) | 16 | ) |
| 4044 | 16 | 17 | ||
| 4045 | 17 | if(MIR_TEST_PLATFORM STREQUAL "android") | 18 | if(MIR_TEST_PLATFORM STREQUAL "android") |
| 4046 | 18 | 19 | ||
| 4047 | === modified file 'tests/unit-tests/client/android/test_android_client_platform.cpp' | |||
| 4048 | --- tests/unit-tests/client/android/test_android_client_platform.cpp 2014-03-06 06:05:17 +0000 | |||
| 4049 | +++ tests/unit-tests/client/android/test_android_client_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 4050 | @@ -17,9 +17,9 @@ | |||
| 4051 | 17 | */ | 17 | */ |
| 4052 | 18 | 18 | ||
| 4053 | 19 | #include "src/client/client_platform.h" | 19 | #include "src/client/client_platform.h" |
| 4054 | 20 | #include "src/client/android/client_platform_factory.h" | ||
| 4055 | 21 | #include "mir_test_doubles/mock_client_context.h" | 20 | #include "mir_test_doubles/mock_client_context.h" |
| 4056 | 22 | #include "mir_test_doubles/mock_client_surface.h" | 21 | #include "mir_test_doubles/mock_client_surface.h" |
| 4057 | 22 | #include "mir_test_framework/client_platform_factory.h" | ||
| 4058 | 23 | 23 | ||
| 4059 | 24 | #include <EGL/egl.h> | 24 | #include <EGL/egl.h> |
| 4060 | 25 | 25 | ||
| 4061 | @@ -28,13 +28,12 @@ | |||
| 4062 | 28 | namespace mcl = mir::client; | 28 | namespace mcl = mir::client; |
| 4063 | 29 | namespace mt = mir::test; | 29 | namespace mt = mir::test; |
| 4064 | 30 | namespace mtd = mt::doubles; | 30 | namespace mtd = mt::doubles; |
| 4065 | 31 | namespace mtf = mir_test_framework; | ||
| 4066 | 31 | 32 | ||
| 4067 | 32 | TEST(AndroidClientPlatformTest, egl_native_display_is_egl_default_display) | 33 | TEST(AndroidClientPlatformTest, egl_native_display_is_egl_default_display) |
| 4068 | 33 | { | 34 | { |
| 4069 | 34 | mtd::MockClientContext context; | ||
| 4070 | 35 | mcl::android::ClientPlatformFactory factory; | ||
| 4071 | 36 | mtd::MockClientSurface surface; | 35 | mtd::MockClientSurface surface; |
| 4073 | 37 | auto platform = factory.create_client_platform(&context); | 36 | auto platform = mtf::create_android_client_platform(); |
| 4074 | 38 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); | 37 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); |
| 4075 | 39 | auto native_display = platform->create_egl_native_display(); | 38 | auto native_display = platform->create_egl_native_display(); |
| 4076 | 40 | EXPECT_EQ(EGL_DEFAULT_DISPLAY, *native_display); | 39 | EXPECT_EQ(EGL_DEFAULT_DISPLAY, *native_display); |
| 4077 | @@ -42,10 +41,8 @@ | |||
| 4078 | 42 | 41 | ||
| 4079 | 43 | TEST(AndroidClientPlatformTest, egl_native_window_is_set) | 42 | TEST(AndroidClientPlatformTest, egl_native_window_is_set) |
| 4080 | 44 | { | 43 | { |
| 4081 | 45 | mtd::MockClientContext context; | ||
| 4082 | 46 | mcl::android::ClientPlatformFactory factory; | ||
| 4083 | 47 | mtd::MockClientSurface surface; | 44 | mtd::MockClientSurface surface; |
| 4085 | 48 | auto platform = factory.create_client_platform(&context); | 45 | auto platform = mtf::create_android_client_platform(); |
| 4086 | 49 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); | 46 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); |
| 4087 | 50 | auto egl_native_window = platform->create_egl_native_window(&surface); | 47 | auto egl_native_window = platform->create_egl_native_window(&surface); |
| 4088 | 51 | EXPECT_NE(nullptr, egl_native_window); | 48 | EXPECT_NE(nullptr, egl_native_window); |
| 4089 | 52 | 49 | ||
| 4090 | === modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp' | |||
| 4091 | --- tests/unit-tests/client/mesa/test_client_platform.cpp 2014-03-06 06:05:17 +0000 | |||
| 4092 | +++ tests/unit-tests/client/mesa/test_client_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 4093 | @@ -17,9 +17,9 @@ | |||
| 4094 | 17 | */ | 17 | */ |
| 4095 | 18 | 18 | ||
| 4096 | 19 | #include "src/client/client_platform.h" | 19 | #include "src/client/client_platform.h" |
| 4098 | 20 | #include "src/client/mesa/client_platform_factory.h" | 20 | #include "mir/shared_library.h" |
| 4099 | 21 | #include "src/client/mesa/mesa_native_display_container.h" | 21 | #include "src/client/mesa/mesa_native_display_container.h" |
| 4101 | 22 | #include "mir_test_doubles/mock_client_context.h" | 22 | #include "mir_test_framework/client_platform_factory.h" |
| 4102 | 23 | #include "mir_test_doubles/mock_client_surface.h" | 23 | #include "mir_test_doubles/mock_client_surface.h" |
| 4103 | 24 | 24 | ||
| 4104 | 25 | #include "mir_toolkit/mesa/native_display.h" | 25 | #include "mir_toolkit/mesa/native_display.h" |
| 4105 | @@ -30,19 +30,20 @@ | |||
| 4106 | 30 | namespace mclm = mir::client::mesa; | 30 | namespace mclm = mir::client::mesa; |
| 4107 | 31 | namespace mt = mir::test; | 31 | namespace mt = mir::test; |
| 4108 | 32 | namespace mtd = mir::test::doubles; | 32 | namespace mtd = mir::test::doubles; |
| 4109 | 33 | namespace mtf = mir_test_framework; | ||
| 4110 | 33 | 34 | ||
| 4111 | 34 | TEST(MesaClientPlatformTest, egl_native_display_is_valid_until_released) | 35 | TEST(MesaClientPlatformTest, egl_native_display_is_valid_until_released) |
| 4112 | 35 | { | 36 | { |
| 4116 | 36 | mtd::MockClientContext context; | 37 | auto platform = mtf::create_mesa_client_platform(); |
| 4117 | 37 | mclm::ClientPlatformFactory factory; | 38 | auto platform_lib = mtf::get_platform_library(); |
| 4115 | 38 | auto platform = factory.create_client_platform(&context); | ||
| 4118 | 39 | 39 | ||
| 4119 | 40 | MirMesaEGLNativeDisplay* nd; | 40 | MirMesaEGLNativeDisplay* nd; |
| 4120 | 41 | { | 41 | { |
| 4121 | 42 | std::shared_ptr<EGLNativeDisplayType> native_display = platform->create_egl_native_display(); | 42 | std::shared_ptr<EGLNativeDisplayType> native_display = platform->create_egl_native_display(); |
| 4122 | 43 | 43 | ||
| 4123 | 44 | nd = reinterpret_cast<MirMesaEGLNativeDisplay*>(*native_display); | 44 | nd = reinterpret_cast<MirMesaEGLNativeDisplay*>(*native_display); |
| 4125 | 45 | EXPECT_EQ(MIR_MESA_TRUE, mclm::mir_client_mesa_egl_native_display_is_valid(nd)); | 45 | auto validate = platform_lib->load_function<MirBool(*)(MirMesaEGLNativeDisplay*)>("mir_client_mesa_egl_native_display_is_valid"); |
| 4126 | 46 | EXPECT_EQ(MIR_MESA_TRUE, validate(nd)); | ||
| 4127 | 46 | } | 47 | } |
| 4128 | 47 | EXPECT_EQ(MIR_MESA_FALSE, mclm::mir_client_mesa_egl_native_display_is_valid(nd)); | 48 | EXPECT_EQ(MIR_MESA_FALSE, mclm::mir_client_mesa_egl_native_display_is_valid(nd)); |
| 4129 | 48 | } | 49 | } |
| 4130 | 49 | 50 | ||
| 4131 | === modified file 'tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp' | |||
| 4132 | --- tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp 2014-03-06 06:05:17 +0000 | |||
| 4133 | +++ tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp 2014-08-29 01:18:58 +0000 | |||
| 4134 | @@ -40,7 +40,7 @@ | |||
| 4135 | 40 | } | 40 | } |
| 4136 | 41 | 41 | ||
| 4137 | 42 | std::shared_ptr<mclg::MesaNativeDisplayContainer> const container; | 42 | std::shared_ptr<mclg::MesaNativeDisplayContainer> const container; |
| 4139 | 43 | MirConnection* connection; | 43 | mir::client::ClientContext* connection; |
| 4140 | 44 | }; | 44 | }; |
| 4141 | 45 | 45 | ||
| 4142 | 46 | } | 46 | } |
| 4143 | 47 | 47 | ||
| 4144 | === modified file 'tests/unit-tests/client/test_client_platform.cpp' | |||
| 4145 | --- tests/unit-tests/client/test_client_platform.cpp 2014-03-06 06:05:17 +0000 | |||
| 4146 | +++ tests/unit-tests/client/test_client_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 4147 | @@ -20,60 +20,140 @@ | |||
| 4148 | 20 | #include "src/client/mir_client_surface.h" | 20 | #include "src/client/mir_client_surface.h" |
| 4149 | 21 | #include "mir_test_doubles/mock_client_context.h" | 21 | #include "mir_test_doubles/mock_client_context.h" |
| 4150 | 22 | #include "mir_test_doubles/mock_client_surface.h" | 22 | #include "mir_test_doubles/mock_client_surface.h" |
| 4151 | 23 | #include "mir_test_framework/executable_path.h" | ||
| 4152 | 23 | 24 | ||
| 4154 | 24 | #ifdef ANDROID | 25 | #ifdef MIR_BUILD_PLATFORM_ANDROID |
| 4155 | 25 | #include "mir_test_doubles/mock_android_hw.h" | 26 | #include "mir_test_doubles/mock_android_hw.h" |
| 4156 | 26 | #include "src/client/android/client_platform_factory.h" | ||
| 4157 | 27 | #else | ||
| 4158 | 28 | #include "src/client/mesa/client_platform_factory.h" | ||
| 4159 | 29 | #endif | 27 | #endif |
| 4160 | 30 | 28 | ||
| 4161 | 29 | #include "src/client/client_platform_factory.h" | ||
| 4162 | 30 | |||
| 4163 | 31 | #include "mir/shared_library.h" | ||
| 4164 | 32 | |||
| 4165 | 31 | #include <gmock/gmock.h> | 33 | #include <gmock/gmock.h> |
| 4166 | 32 | #include <gtest/gtest.h> | 34 | #include <gtest/gtest.h> |
| 4167 | 33 | 35 | ||
| 4168 | 34 | namespace mcl=mir::client; | 36 | namespace mcl=mir::client; |
| 4169 | 35 | namespace mtd = mir::test::doubles; | 37 | namespace mtd = mir::test::doubles; |
| 4173 | 36 | 38 | namespace mtf = mir_test_framework; | |
| 4174 | 37 | struct ClientPlatformTest : public ::testing::Test | 39 | |
| 4175 | 38 | { | 40 | namespace |
| 4176 | 41 | { | ||
| 4177 | 42 | struct ClientPlatformTraits | ||
| 4178 | 43 | { | ||
| 4179 | 44 | ClientPlatformTraits(std::string const& library, | ||
| 4180 | 45 | std::function<void(MirPlatformPackage&)> populator, | ||
| 4181 | 46 | MirPlatformType type) | ||
| 4182 | 47 | : platform_library_name{library}, | ||
| 4183 | 48 | populate_package_for{populator}, | ||
| 4184 | 49 | platform_type{type} | ||
| 4185 | 50 | { | ||
| 4186 | 51 | } | ||
| 4187 | 52 | |||
| 4188 | 53 | std::string const platform_library_name; | ||
| 4189 | 54 | std::function<void(MirPlatformPackage&)> const populate_package_for; | ||
| 4190 | 55 | MirPlatformType const platform_type; | ||
| 4191 | 56 | }; | ||
| 4192 | 57 | |||
| 4193 | 58 | struct ClientPlatformTest : public ::testing::TestWithParam<ClientPlatformTraits const*> | ||
| 4194 | 59 | { | ||
| 4195 | 60 | ClientPlatformTest() | ||
| 4196 | 61 | : platform_library{mtf::library_path() + "/" + GetParam()->platform_library_name}, | ||
| 4197 | 62 | create_client_platform{platform_library.load_function<mcl::CreateClientPlatform>("create_client_platform")}, | ||
| 4198 | 63 | probe{platform_library.load_function<mcl::ClientPlatformProbe>("is_appropriate_module")} | ||
| 4199 | 64 | { | ||
| 4200 | 65 | using namespace testing; | ||
| 4201 | 66 | ON_CALL(context, populate(_)) | ||
| 4202 | 67 | .WillByDefault(Invoke(GetParam()->populate_package_for)); | ||
| 4203 | 68 | } | ||
| 4204 | 69 | |||
| 4205 | 39 | mtd::MockClientContext context; | 70 | mtd::MockClientContext context; |
| 4207 | 40 | #ifdef ANDROID | 71 | #ifdef MIR_BUILD_PLATFORM_ANDROID |
| 4208 | 41 | testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock; | 72 | testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock; |
| 4209 | 42 | mcl::android::ClientPlatformFactory factory; | ||
| 4210 | 43 | #else | ||
| 4211 | 44 | mcl::mesa::ClientPlatformFactory factory; | ||
| 4212 | 45 | #endif | 73 | #endif |
| 4213 | 74 | mir::SharedLibrary platform_library; | ||
| 4214 | 75 | mcl::CreateClientPlatform const create_client_platform; | ||
| 4215 | 76 | mcl::ClientPlatformProbe const probe; | ||
| 4216 | 46 | }; | 77 | }; |
| 4217 | 47 | 78 | ||
| 4232 | 48 | TEST_F(ClientPlatformTest, platform_name) | 79 | #ifdef MIR_BUILD_PLATFORM_ANDROID |
| 4233 | 49 | { | 80 | ClientPlatformTraits const android_platform{"client-platform-android.so", |
| 4234 | 50 | auto platform = factory.create_client_platform(&context); | 81 | [](MirPlatformPackage& pkg) |
| 4235 | 51 | #ifdef ANDROID | 82 | { |
| 4236 | 52 | auto type = mir_platform_type_android; | 83 | ::memset(&pkg, 0, sizeof(pkg)); |
| 4237 | 53 | #else | 84 | }, |
| 4238 | 54 | auto type = mir_platform_type_gbm; | 85 | mir_platform_type_android |
| 4239 | 55 | #endif | 86 | }; |
| 4240 | 56 | EXPECT_EQ(type, platform->platform_type()); | 87 | |
| 4241 | 57 | } | 88 | INSTANTIATE_TEST_CASE_P(Android, |
| 4242 | 58 | 89 | ClientPlatformTest, | |
| 4243 | 59 | TEST_F(ClientPlatformTest, platform_creates) | 90 | ::testing::Values(&android_platform)); |
| 4244 | 60 | { | 91 | |
| 4245 | 61 | auto platform = factory.create_client_platform(&context); | 92 | #endif |
| 4246 | 93 | |||
| 4247 | 94 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4248 | 95 | ClientPlatformTraits const mesa_platform{"client-platform-mesa.so", | ||
| 4249 | 96 | [](MirPlatformPackage& pkg) | ||
| 4250 | 97 | { | ||
| 4251 | 98 | ::memset(&pkg, 0, sizeof(pkg)); | ||
| 4252 | 99 | pkg.fd_items = 1; | ||
| 4253 | 100 | }, | ||
| 4254 | 101 | mir_platform_type_gbm | ||
| 4255 | 102 | }; | ||
| 4256 | 103 | |||
| 4257 | 104 | INSTANTIATE_TEST_CASE_P(Mesa, | ||
| 4258 | 105 | ClientPlatformTest, | ||
| 4259 | 106 | ::testing::Values(&mesa_platform)); | ||
| 4260 | 107 | |||
| 4261 | 108 | #endif | ||
| 4262 | 109 | } | ||
| 4263 | 110 | |||
| 4264 | 111 | TEST_P(ClientPlatformTest, platform_name) | ||
| 4265 | 112 | { | ||
| 4266 | 113 | auto platform = create_client_platform(&context); | ||
| 4267 | 114 | |||
| 4268 | 115 | EXPECT_EQ(GetParam()->platform_type, platform->platform_type()); | ||
| 4269 | 116 | } | ||
| 4270 | 117 | |||
| 4271 | 118 | TEST_P(ClientPlatformTest, platform_creates) | ||
| 4272 | 119 | { | ||
| 4273 | 120 | auto platform = create_client_platform(&context); | ||
| 4274 | 62 | auto buffer_factory = platform->create_buffer_factory(); | 121 | auto buffer_factory = platform->create_buffer_factory(); |
| 4275 | 63 | EXPECT_NE(buffer_factory.get(), (mcl::ClientBufferFactory*) NULL); | 122 | EXPECT_NE(buffer_factory.get(), (mcl::ClientBufferFactory*) NULL); |
| 4276 | 64 | } | 123 | } |
| 4277 | 65 | 124 | ||
| 4279 | 66 | TEST_F(ClientPlatformTest, platform_creates_native_window) | 125 | TEST_P(ClientPlatformTest, platform_creates_native_window) |
| 4280 | 67 | { | 126 | { |
| 4282 | 68 | auto platform = factory.create_client_platform(&context); | 127 | auto platform = create_client_platform(&context); |
| 4283 | 69 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); | 128 | auto mock_client_surface = std::make_shared<mtd::MockClientSurface>(); |
| 4284 | 70 | auto native_window = platform->create_egl_native_window(mock_client_surface.get()); | 129 | auto native_window = platform->create_egl_native_window(mock_client_surface.get()); |
| 4285 | 71 | EXPECT_NE(*native_window, (EGLNativeWindowType) NULL); | 130 | EXPECT_NE(*native_window, (EGLNativeWindowType) NULL); |
| 4286 | 72 | } | 131 | } |
| 4287 | 73 | 132 | ||
| 4289 | 74 | TEST_F(ClientPlatformTest, platform_creates_egl_native_display) | 133 | TEST_P(ClientPlatformTest, platform_creates_egl_native_display) |
| 4290 | 75 | { | 134 | { |
| 4292 | 76 | auto platform = factory.create_client_platform(&context); | 135 | auto platform = create_client_platform(&context); |
| 4293 | 77 | auto native_display = platform->create_egl_native_display(); | 136 | auto native_display = platform->create_egl_native_display(); |
| 4294 | 78 | EXPECT_NE(nullptr, native_display.get()); | 137 | EXPECT_NE(nullptr, native_display.get()); |
| 4295 | 79 | } | 138 | } |
| 4296 | 139 | |||
| 4297 | 140 | TEST_P(ClientPlatformTest, platform_probe_returns_success_when_matching) | ||
| 4298 | 141 | { | ||
| 4299 | 142 | EXPECT_TRUE(probe(&context)); | ||
| 4300 | 143 | } | ||
| 4301 | 144 | |||
| 4302 | 145 | TEST_P(ClientPlatformTest, platform_probe_returns_false_when_not_matching) | ||
| 4303 | 146 | { | ||
| 4304 | 147 | using namespace testing; | ||
| 4305 | 148 | ON_CALL(context, populate(_)) | ||
| 4306 | 149 | .WillByDefault(Invoke([](MirPlatformPackage& pkg) | ||
| 4307 | 150 | { | ||
| 4308 | 151 | //Mock up something that hopefully looks nothing like | ||
| 4309 | 152 | //what the platform is expecting... | ||
| 4310 | 153 | ::memset(&pkg, 0, sizeof(pkg)); | ||
| 4311 | 154 | pkg.data_items = 0xdeadbeef; | ||
| 4312 | 155 | pkg.fd_items = -23; | ||
| 4313 | 156 | })); | ||
| 4314 | 157 | |||
| 4315 | 158 | EXPECT_FALSE(probe(&context)); | ||
| 4316 | 159 | } | ||
| 4317 | 80 | 160 | ||
| 4318 | === added file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp' | |||
| 4319 | --- tests/unit-tests/client/test_probing_client_platform_factory.cpp 1970-01-01 00:00:00 +0000 | |||
| 4320 | +++ tests/unit-tests/client/test_probing_client_platform_factory.cpp 2014-08-29 01:18:58 +0000 | |||
| 4321 | @@ -0,0 +1,116 @@ | |||
| 4322 | 1 | /* | ||
| 4323 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 4324 | 3 | * | ||
| 4325 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 4326 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
| 4327 | 6 | * published by the Free Software Foundation. | ||
| 4328 | 7 | * | ||
| 4329 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 4330 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 4331 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 4332 | 11 | * GNU General Public License for more details. | ||
| 4333 | 12 | * | ||
| 4334 | 13 | * You should have received a copy of the GNU General Public License | ||
| 4335 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 4336 | 15 | * | ||
| 4337 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 4338 | 17 | */ | ||
| 4339 | 18 | |||
| 4340 | 19 | #include "src/client/client_platform.h" | ||
| 4341 | 20 | #include "src/client/probing_client_platform_factory.h" | ||
| 4342 | 21 | |||
| 4343 | 22 | #include "mir_test_doubles/mock_client_context.h" | ||
| 4344 | 23 | #include "mir_test_framework/executable_path.h" | ||
| 4345 | 24 | |||
| 4346 | 25 | #include <gmock/gmock.h> | ||
| 4347 | 26 | #include <gtest/gtest.h> | ||
| 4348 | 27 | |||
| 4349 | 28 | namespace mtf = mir_test_framework; | ||
| 4350 | 29 | namespace mtd = mir::test::doubles; | ||
| 4351 | 30 | |||
| 4352 | 31 | namespace | ||
| 4353 | 32 | { | ||
| 4354 | 33 | std::vector<std::shared_ptr<mir::SharedLibrary>> | ||
| 4355 | 34 | all_available_modules() | ||
| 4356 | 35 | { | ||
| 4357 | 36 | std::vector<std::shared_ptr<mir::SharedLibrary>> modules; | ||
| 4358 | 37 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4359 | 38 | modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-platform-mesa.so")); | ||
| 4360 | 39 | #endif | ||
| 4361 | 40 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4362 | 41 | modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-platform-android.so")); | ||
| 4363 | 42 | #endif | ||
| 4364 | 43 | return modules; | ||
| 4365 | 44 | } | ||
| 4366 | 45 | } | ||
| 4367 | 46 | |||
| 4368 | 47 | TEST(ProbingClientPlatformFactory, ThrowsErrorWhenConstructedWithNoPlatforms) | ||
| 4369 | 48 | { | ||
| 4370 | 49 | std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules; | ||
| 4371 | 50 | EXPECT_THROW(mir::client::ProbingClientPlatformFactory{empty_modules}, | ||
| 4372 | 51 | std::runtime_error); | ||
| 4373 | 52 | } | ||
| 4374 | 53 | |||
| 4375 | 54 | TEST(ProbingClientPlatformFactory, ThrowsErrorWhenNoPlatformPluginProbesSuccessfully) | ||
| 4376 | 55 | { | ||
| 4377 | 56 | using namespace testing; | ||
| 4378 | 57 | |||
| 4379 | 58 | mir::client::ProbingClientPlatformFactory factory{all_available_modules()}; | ||
| 4380 | 59 | |||
| 4381 | 60 | mtd::MockClientContext context; | ||
| 4382 | 61 | ON_CALL(context, populate(_)) | ||
| 4383 | 62 | .WillByDefault(Invoke([](MirPlatformPackage& pkg) | ||
| 4384 | 63 | { | ||
| 4385 | 64 | ::memset(&pkg, 0, sizeof(MirPlatformPackage)); | ||
| 4386 | 65 | // Mock up a platform package that looks nothing like | ||
| 4387 | 66 | // either an Android or Mesa package | ||
| 4388 | 67 | pkg.fd_items = 0xdeadbeef; | ||
| 4389 | 68 | pkg.data_items = -23; | ||
| 4390 | 69 | })); | ||
| 4391 | 70 | |||
| 4392 | 71 | EXPECT_THROW(factory.create_client_platform(&context), | ||
| 4393 | 72 | std::runtime_error); | ||
| 4394 | 73 | } | ||
| 4395 | 74 | |||
| 4396 | 75 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4397 | 76 | TEST(ProbingClientPlatformFactory, CreatesMesaPlatformWhenAppropriate) | ||
| 4398 | 77 | { | ||
| 4399 | 78 | using namespace testing; | ||
| 4400 | 79 | |||
| 4401 | 80 | mir::client::ProbingClientPlatformFactory factory{all_available_modules()}; | ||
| 4402 | 81 | |||
| 4403 | 82 | mtd::MockClientContext context; | ||
| 4404 | 83 | ON_CALL(context, populate(_)) | ||
| 4405 | 84 | .WillByDefault(Invoke([](MirPlatformPackage& pkg) | ||
| 4406 | 85 | { | ||
| 4407 | 86 | ::memset(&pkg, 0, sizeof(MirPlatformPackage)); | ||
| 4408 | 87 | // Mock up something that looks like a GBM platform package, | ||
| 4409 | 88 | // until we send the actual platform type over the wire! | ||
| 4410 | 89 | pkg.fd_items = 1; | ||
| 4411 | 90 | pkg.fd[0] = 23; | ||
| 4412 | 91 | })); | ||
| 4413 | 92 | auto platform = factory.create_client_platform(&context); | ||
| 4414 | 93 | EXPECT_EQ(mir_platform_type_gbm, platform->platform_type()); | ||
| 4415 | 94 | } | ||
| 4416 | 95 | #endif | ||
| 4417 | 96 | |||
| 4418 | 97 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4419 | 98 | TEST(ProbingClientPlatformFactory, CreatesAndroidPlatformWhenAppropriate) | ||
| 4420 | 99 | { | ||
| 4421 | 100 | using namespace testing; | ||
| 4422 | 101 | |||
| 4423 | 102 | mir::client::ProbingClientPlatformFactory factory{all_available_modules()}; | ||
| 4424 | 103 | |||
| 4425 | 104 | mtd::MockClientContext context; | ||
| 4426 | 105 | ON_CALL(context, populate(_)) | ||
| 4427 | 106 | .WillByDefault(Invoke([](MirPlatformPackage& pkg) | ||
| 4428 | 107 | { | ||
| 4429 | 108 | // Mock up something that looks like a Android platform package, | ||
| 4430 | 109 | // until we send the actual platform type over the wire! | ||
| 4431 | 110 | ::memset(&pkg, 0, sizeof(MirPlatformPackage)); | ||
| 4432 | 111 | })); | ||
| 4433 | 112 | |||
| 4434 | 113 | auto platform = factory.create_client_platform(&context); | ||
| 4435 | 114 | EXPECT_EQ(mir_platform_type_android, platform->platform_type()); | ||
| 4436 | 115 | } | ||
| 4437 | 116 | #endif | ||
| 4438 | 0 | 117 | ||
| 4439 | === modified file 'tests/unit-tests/graphics/CMakeLists.txt' | |||
| 4440 | --- tests/unit-tests/graphics/CMakeLists.txt 2014-07-02 06:29:24 +0000 | |||
| 4441 | +++ tests/unit-tests/graphics/CMakeLists.txt 2014-08-29 01:18:58 +0000 | |||
| 4442 | @@ -10,6 +10,7 @@ | |||
| 4443 | 10 | ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp | 10 | ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp |
| 4444 | 11 | ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp | 11 | ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp |
| 4445 | 12 | ${CMAKE_CURRENT_SOURCE_DIR}/test_program_factory.cpp | 12 | ${CMAKE_CURRENT_SOURCE_DIR}/test_program_factory.cpp |
| 4446 | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_prober.cpp | ||
| 4447 | 13 | ) | 14 | ) |
| 4448 | 14 | 15 | ||
| 4449 | 15 | add_subdirectory(nested/) | 16 | add_subdirectory(nested/) |
| 4450 | 16 | 17 | ||
| 4451 | === modified file 'tests/unit-tests/graphics/android/test_android_platform.cpp' | |||
| 4452 | --- tests/unit-tests/graphics/android/test_android_platform.cpp 2014-08-07 13:22:53 +0000 | |||
| 4453 | +++ tests/unit-tests/graphics/android/test_android_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 4454 | @@ -29,6 +29,8 @@ | |||
| 4455 | 29 | #include "mir_test_doubles/fd_matcher.h" | 29 | #include "mir_test_doubles/fd_matcher.h" |
| 4456 | 30 | #include "mir_test/fake_shared.h" | 30 | #include "mir_test/fake_shared.h" |
| 4457 | 31 | #include "mir_test_doubles/mock_android_native_buffer.h" | 31 | #include "mir_test_doubles/mock_android_native_buffer.h" |
| 4458 | 32 | #include "mir_test_framework/executable_path.h" | ||
| 4459 | 33 | #include "mir/shared_library.h" | ||
| 4460 | 32 | #include <system/window.h> | 34 | #include <system/window.h> |
| 4461 | 33 | #include <gtest/gtest.h> | 35 | #include <gtest/gtest.h> |
| 4462 | 34 | 36 | ||
| 4463 | @@ -39,6 +41,7 @@ | |||
| 4464 | 39 | namespace mr=mir::report; | 41 | namespace mr=mir::report; |
| 4465 | 40 | namespace geom=mir::geometry; | 42 | namespace geom=mir::geometry; |
| 4466 | 41 | namespace mo=mir::options; | 43 | namespace mo=mir::options; |
| 4467 | 44 | namespace mtf=mir_test_framework; | ||
| 4468 | 42 | 45 | ||
| 4469 | 43 | class PlatformBufferIPCPackaging : public ::testing::Test | 46 | class PlatformBufferIPCPackaging : public ::testing::Test |
| 4470 | 44 | { | 47 | { |
| 4471 | @@ -154,6 +157,27 @@ | |||
| 4472 | 154 | EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display()); | 157 | EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display()); |
| 4473 | 155 | } | 158 | } |
| 4474 | 156 | 159 | ||
| 4475 | 160 | TEST(AndroidGraphicsPlatform, probe_returns_unsupported_when_no_hwaccess) | ||
| 4476 | 161 | { | ||
| 4477 | 162 | using namespace testing; | ||
| 4478 | 163 | NiceMock<mtd::HardwareAccessMock> hwaccess; | ||
| 4479 | 164 | |||
| 4480 | 165 | ON_CALL(hwaccess, hw_get_module(_,_)).WillByDefault(Return(-1)); | ||
| 4481 | 166 | |||
| 4482 | 167 | mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-android.so"}; | ||
| 4483 | 168 | auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform"); | ||
| 4484 | 169 | EXPECT_EQ(mg::PlatformPriority::unsupported, probe()); | ||
| 4485 | 170 | } | ||
| 4486 | 171 | |||
| 4487 | 172 | TEST(AndroidGraphicsPlatform, probe_returns_best_when_hwaccess_succeeds) | ||
| 4488 | 173 | { | ||
| 4489 | 174 | testing::NiceMock<mtd::HardwareAccessMock> hwaccess; | ||
| 4490 | 175 | |||
| 4491 | 176 | mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-android.so"}; | ||
| 4492 | 177 | auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform"); | ||
| 4493 | 178 | EXPECT_EQ(mg::PlatformPriority::best, probe()); | ||
| 4494 | 179 | } | ||
| 4495 | 180 | |||
| 4496 | 157 | TEST(NestedPlatformCreation, doesnt_access_display_hardware) | 181 | TEST(NestedPlatformCreation, doesnt_access_display_hardware) |
| 4497 | 158 | { | 182 | { |
| 4498 | 159 | using namespace testing; | 183 | using namespace testing; |
| 4499 | 160 | 184 | ||
| 4500 | === modified file 'tests/unit-tests/graphics/android/test_output_builder.cpp' | |||
| 4501 | --- tests/unit-tests/graphics/android/test_output_builder.cpp 2014-07-02 06:29:24 +0000 | |||
| 4502 | +++ tests/unit-tests/graphics/android/test_output_builder.cpp 2014-08-29 01:18:58 +0000 | |||
| 4503 | @@ -108,9 +108,10 @@ | |||
| 4504 | 108 | mtd::StubGLConfig stub_gl_config; | 108 | mtd::StubGLConfig stub_gl_config; |
| 4505 | 109 | mga::PbufferGLContext gl_context{ | 109 | mga::PbufferGLContext gl_context{ |
| 4506 | 110 | mga::to_mir_format(mock_egl.fake_visual_id), stub_gl_config, mock_display_report}; | 110 | mga::to_mir_format(mock_egl.fake_visual_id), stub_gl_config, mock_display_report}; |
| 4508 | 111 | mtd::StubGLProgramFactory const stub_program_factory; | 111 | mtd::StubGLProgramFactory stub_program_factory; |
| 4509 | 112 | }; | 112 | }; |
| 4510 | 113 | } | 113 | } |
| 4511 | 114 | |||
| 4512 | 114 | TEST_F(OutputBuilder, hwc_version_10_success) | 115 | TEST_F(OutputBuilder, hwc_version_10_success) |
| 4513 | 115 | { | 116 | { |
| 4514 | 116 | using namespace testing; | 117 | using namespace testing; |
| 4515 | 117 | 118 | ||
| 4516 | === modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp' | |||
| 4517 | --- tests/unit-tests/graphics/mesa/test_platform.cpp 2014-08-07 13:22:53 +0000 | |||
| 4518 | +++ tests/unit-tests/graphics/mesa/test_platform.cpp 2014-08-29 01:18:58 +0000 | |||
| 4519 | @@ -23,6 +23,7 @@ | |||
| 4520 | 23 | #include "src/platform/graphics/mesa/internal_client.h" | 23 | #include "src/platform/graphics/mesa/internal_client.h" |
| 4521 | 24 | #include "src/server/report/null_report_factory.h" | 24 | #include "src/server/report/null_report_factory.h" |
| 4522 | 25 | #include "mir/emergency_cleanup_registry.h" | 25 | #include "mir/emergency_cleanup_registry.h" |
| 4523 | 26 | #include "mir/shared_library.h" | ||
| 4524 | 26 | 27 | ||
| 4525 | 27 | #include "mir_test_doubles/mock_buffer.h" | 28 | #include "mir_test_doubles/mock_buffer.h" |
| 4526 | 28 | #include "mir_test_doubles/mock_buffer_packer.h" | 29 | #include "mir_test_doubles/mock_buffer_packer.h" |
| 4527 | @@ -33,6 +34,7 @@ | |||
| 4528 | 33 | #include <gtest/gtest.h> | 34 | #include <gtest/gtest.h> |
| 4529 | 34 | 35 | ||
| 4530 | 35 | #include "mir_test_framework/udev_environment.h" | 36 | #include "mir_test_framework/udev_environment.h" |
| 4531 | 37 | #include "mir_test_framework/executable_path.h" | ||
| 4532 | 36 | #include "mir_test/pipe.h" | 38 | #include "mir_test/pipe.h" |
| 4533 | 37 | 39 | ||
| 4534 | 38 | #include "mir_test_doubles/mock_drm.h" | 40 | #include "mir_test_doubles/mock_drm.h" |
| 4535 | @@ -384,3 +386,23 @@ | |||
| 4536 | 384 | 386 | ||
| 4537 | 385 | Mock::VerifyAndClearExpectations(&mock_drm); | 387 | Mock::VerifyAndClearExpectations(&mock_drm); |
| 4538 | 386 | } | 388 | } |
| 4539 | 389 | |||
| 4540 | 390 | TEST_F(MesaGraphicsPlatform, probe_returns_unsupported_when_no_drm_udev_devices) | ||
| 4541 | 391 | { | ||
| 4542 | 392 | mtf::UdevEnvironment udev_environment; | ||
| 4543 | 393 | |||
| 4544 | 394 | mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-mesa.so"}; | ||
| 4545 | 395 | auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform"); | ||
| 4546 | 396 | EXPECT_EQ(mg::PlatformPriority::unsupported, probe()); | ||
| 4547 | 397 | } | ||
| 4548 | 398 | |||
| 4549 | 399 | TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_exist) | ||
| 4550 | 400 | { | ||
| 4551 | 401 | mtf::UdevEnvironment udev_environment; | ||
| 4552 | 402 | |||
| 4553 | 403 | udev_environment.add_standard_device("standard-drm-devices"); | ||
| 4554 | 404 | |||
| 4555 | 405 | mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-mesa.so"}; | ||
| 4556 | 406 | auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform"); | ||
| 4557 | 407 | EXPECT_EQ(mg::PlatformPriority::best, probe()); | ||
| 4558 | 408 | } | ||
| 4559 | 387 | 409 | ||
| 4560 | === added file 'tests/unit-tests/graphics/test_platform_prober.cpp' | |||
| 4561 | --- tests/unit-tests/graphics/test_platform_prober.cpp 1970-01-01 00:00:00 +0000 | |||
| 4562 | +++ tests/unit-tests/graphics/test_platform_prober.cpp 2014-08-29 01:18:58 +0000 | |||
| 4563 | @@ -0,0 +1,194 @@ | |||
| 4564 | 1 | /* | ||
| 4565 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 4566 | 3 | * | ||
| 4567 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 4568 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
| 4569 | 6 | * published by the Free Software Foundation. | ||
| 4570 | 7 | * | ||
| 4571 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 4572 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 4573 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 4574 | 11 | * GNU General Public License for more details. | ||
| 4575 | 12 | * | ||
| 4576 | 13 | * You should have received a copy of the GNU General Public License | ||
| 4577 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 4578 | 15 | * | ||
| 4579 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 4580 | 17 | */ | ||
| 4581 | 18 | |||
| 4582 | 19 | #include <gtest/gtest.h> | ||
| 4583 | 20 | |||
| 4584 | 21 | #include "src/platform/graphics/platform_probe.h" | ||
| 4585 | 22 | #include "mir/graphics/platform.h" | ||
| 4586 | 23 | |||
| 4587 | 24 | #include "mir/raii.h" | ||
| 4588 | 25 | |||
| 4589 | 26 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4590 | 27 | #include "mir_test_doubles/mock_drm.h" | ||
| 4591 | 28 | #include "mir_test_doubles/mock_gbm.h" | ||
| 4592 | 29 | #endif | ||
| 4593 | 30 | |||
| 4594 | 31 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4595 | 32 | #include "mir_test_doubles/mock_android_hw.h" | ||
| 4596 | 33 | #endif | ||
| 4597 | 34 | |||
| 4598 | 35 | #include "mir_test_framework/udev_environment.h" | ||
| 4599 | 36 | #include "mir_test_framework/executable_path.h" | ||
| 4600 | 37 | |||
| 4601 | 38 | namespace mtf = mir_test_framework; | ||
| 4602 | 39 | namespace mtd = mir::test::doubles; | ||
| 4603 | 40 | |||
| 4604 | 41 | namespace | ||
| 4605 | 42 | { | ||
| 4606 | 43 | std::vector<std::shared_ptr<mir::SharedLibrary>> available_platforms() | ||
| 4607 | 44 | { | ||
| 4608 | 45 | std::vector<std::shared_ptr<mir::SharedLibrary>> modules; | ||
| 4609 | 46 | |||
| 4610 | 47 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4611 | 48 | modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-mesa.so")); | ||
| 4612 | 49 | #endif | ||
| 4613 | 50 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4614 | 51 | modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-android.so")); | ||
| 4615 | 52 | #endif | ||
| 4616 | 53 | return modules; | ||
| 4617 | 54 | } | ||
| 4618 | 55 | |||
| 4619 | 56 | void add_dummy_platform(std::vector<std::shared_ptr<mir::SharedLibrary>>& modules) | ||
| 4620 | 57 | { | ||
| 4621 | 58 | modules.insert(modules.begin(), std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-dummy.so")); | ||
| 4622 | 59 | } | ||
| 4623 | 60 | |||
| 4624 | 61 | std::shared_ptr<void> ensure_android_probing_fails() | ||
| 4625 | 62 | { | ||
| 4626 | 63 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4627 | 64 | using namespace testing; | ||
| 4628 | 65 | auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>(); | ||
| 4629 | 66 | ON_CALL(*mock_android, hw_get_module(_, _)) | ||
| 4630 | 67 | .WillByDefault(Return(-1)); | ||
| 4631 | 68 | return mock_android; | ||
| 4632 | 69 | #else | ||
| 4633 | 70 | return std::shared_ptr<void>{}; | ||
| 4634 | 71 | #endif | ||
| 4635 | 72 | } | ||
| 4636 | 73 | |||
| 4637 | 74 | std::shared_ptr<void> ensure_mesa_probing_fails() | ||
| 4638 | 75 | { | ||
| 4639 | 76 | return std::make_shared<mtf::UdevEnvironment>(); | ||
| 4640 | 77 | } | ||
| 4641 | 78 | |||
| 4642 | 79 | std::shared_ptr<void> ensure_mesa_probing_succeeds() | ||
| 4643 | 80 | { | ||
| 4644 | 81 | auto udev = std::make_shared<mtf::UdevEnvironment>(); | ||
| 4645 | 82 | |||
| 4646 | 83 | udev->add_standard_device("standard-drm-devices"); | ||
| 4647 | 84 | |||
| 4648 | 85 | return udev; | ||
| 4649 | 86 | } | ||
| 4650 | 87 | |||
| 4651 | 88 | std::shared_ptr<void> ensure_android_probing_succeeds() | ||
| 4652 | 89 | { | ||
| 4653 | 90 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4654 | 91 | using namespace testing; | ||
| 4655 | 92 | auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>(); | ||
| 4656 | 93 | ON_CALL(*mock_android, hw_get_module(_, _)) | ||
| 4657 | 94 | .WillByDefault(Return(0)); | ||
| 4658 | 95 | return mock_android; | ||
| 4659 | 96 | #else | ||
| 4660 | 97 | return std::shared_ptr<void>{}; | ||
| 4661 | 98 | #endif | ||
| 4662 | 99 | } | ||
| 4663 | 100 | } | ||
| 4664 | 101 | |||
| 4665 | 102 | TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError) | ||
| 4666 | 103 | { | ||
| 4667 | 104 | std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules; | ||
| 4668 | 105 | EXPECT_THROW(mir::graphics::module_for_device(empty_modules), | ||
| 4669 | 106 | std::runtime_error); | ||
| 4670 | 107 | } | ||
| 4671 | 108 | |||
| 4672 | 109 | #ifdef MIR_BUILD_PLATFORM_MESA | ||
| 4673 | 110 | TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent) | ||
| 4674 | 111 | { | ||
| 4675 | 112 | using namespace testing; | ||
| 4676 | 113 | auto block_android = ensure_android_probing_fails(); | ||
| 4677 | 114 | auto fake_mesa = ensure_mesa_probing_succeeds(); | ||
| 4678 | 115 | |||
| 4679 | 116 | auto modules = available_platforms(); | ||
| 4680 | 117 | |||
| 4681 | 118 | auto module = mir::graphics::module_for_device(modules); | ||
| 4682 | 119 | ASSERT_NE(nullptr, module); | ||
| 4683 | 120 | |||
| 4684 | 121 | auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module"); | ||
| 4685 | 122 | auto description = descriptor(); | ||
| 4686 | 123 | |||
| 4687 | 124 | EXPECT_THAT(description->name, HasSubstr("mesa")); | ||
| 4688 | 125 | } | ||
| 4689 | 126 | #endif | ||
| 4690 | 127 | |||
| 4691 | 128 | #ifdef MIR_BUILD_PLATFORM_ANDROID | ||
| 4692 | 129 | TEST(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds) | ||
| 4693 | 130 | { | ||
| 4694 | 131 | using namespace testing; | ||
| 4695 | 132 | |||
| 4696 | 133 | auto block_mesa = ensure_mesa_probing_fails(); | ||
| 4697 | 134 | auto fake_android = ensure_android_probing_succeeds(); | ||
| 4698 | 135 | |||
| 4699 | 136 | auto modules = available_platforms(); | ||
| 4700 | 137 | |||
| 4701 | 138 | auto module = mir::graphics::module_for_device(modules); | ||
| 4702 | 139 | ASSERT_NE(nullptr, module); | ||
| 4703 | 140 | |||
| 4704 | 141 | auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module"); | ||
| 4705 | 142 | auto description = descriptor(); | ||
| 4706 | 143 | |||
| 4707 | 144 | EXPECT_THAT(description->name, HasSubstr("android")); | ||
| 4708 | 145 | } | ||
| 4709 | 146 | #endif | ||
| 4710 | 147 | |||
| 4711 | 148 | TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully) | ||
| 4712 | 149 | { | ||
| 4713 | 150 | using namespace testing; | ||
| 4714 | 151 | auto block_android = ensure_android_probing_fails(); | ||
| 4715 | 152 | auto block_mesa = ensure_mesa_probing_fails(); | ||
| 4716 | 153 | |||
| 4717 | 154 | |||
| 4718 | 155 | EXPECT_THROW(mir::graphics::module_for_device(available_platforms()), | ||
| 4719 | 156 | std::runtime_error); | ||
| 4720 | 157 | } | ||
| 4721 | 158 | |||
| 4722 | 159 | TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule) | ||
| 4723 | 160 | { | ||
| 4724 | 161 | using namespace testing; | ||
| 4725 | 162 | auto block_android = ensure_android_probing_fails(); | ||
| 4726 | 163 | auto block_mesa = ensure_mesa_probing_fails(); | ||
| 4727 | 164 | |||
| 4728 | 165 | auto modules = available_platforms(); | ||
| 4729 | 166 | add_dummy_platform(modules); | ||
| 4730 | 167 | |||
| 4731 | 168 | auto module = mir::graphics::module_for_device(modules); | ||
| 4732 | 169 | ASSERT_NE(nullptr, module); | ||
| 4733 | 170 | |||
| 4734 | 171 | auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module"); | ||
| 4735 | 172 | auto description = descriptor(); | ||
| 4736 | 173 | |||
| 4737 | 174 | EXPECT_THAT(description->name, HasSubstr("dummy")); | ||
| 4738 | 175 | } | ||
| 4739 | 176 | |||
| 4740 | 177 | TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy) | ||
| 4741 | 178 | { | ||
| 4742 | 179 | using namespace testing; | ||
| 4743 | 180 | |||
| 4744 | 181 | auto ensure_mesa = ensure_mesa_probing_succeeds(); | ||
| 4745 | 182 | auto ensure_android = ensure_android_probing_succeeds(); | ||
| 4746 | 183 | |||
| 4747 | 184 | auto modules = available_platforms(); | ||
| 4748 | 185 | add_dummy_platform(modules); | ||
| 4749 | 186 | |||
| 4750 | 187 | auto module = mir::graphics::module_for_device(modules); | ||
| 4751 | 188 | ASSERT_NE(nullptr, module); | ||
| 4752 | 189 | |||
| 4753 | 190 | auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module"); | ||
| 4754 | 191 | auto description = descriptor(); | ||
| 4755 | 192 | |||
| 4756 | 193 | EXPECT_THAT(description->name, Not(HasSubstr("dummy"))); | ||
| 4757 | 194 | } | ||
| 4758 | 0 | 195 | ||
| 4759 | === modified file 'tests/unit-tests/shared_library_test.cpp' | |||
| 4760 | --- tests/unit-tests/shared_library_test.cpp 2013-06-21 12:08:34 +0000 | |||
| 4761 | +++ tests/unit-tests/shared_library_test.cpp 2014-08-29 01:18:58 +0000 | |||
| 4762 | @@ -21,15 +21,19 @@ | |||
| 4763 | 21 | #include <gtest/gtest.h> | 21 | #include <gtest/gtest.h> |
| 4764 | 22 | 22 | ||
| 4765 | 23 | #include <boost/exception/diagnostic_information.hpp> | 23 | #include <boost/exception/diagnostic_information.hpp> |
| 4766 | 24 | |||
| 4767 | 25 | #include <stdexcept> | 24 | #include <stdexcept> |
| 4768 | 26 | 25 | ||
| 4769 | 26 | #include "mir_test_framework/executable_path.h" | ||
| 4770 | 27 | |||
| 4771 | 28 | namespace mtf = mir_test_framework; | ||
| 4772 | 29 | |||
| 4773 | 27 | namespace | 30 | namespace |
| 4774 | 28 | { | 31 | { |
| 4775 | 29 | class HasSubstring | 32 | class HasSubstring |
| 4776 | 30 | { | 33 | { |
| 4777 | 31 | public: | 34 | public: |
| 4778 | 32 | HasSubstring(char const* substring) : substring(substring) {} | 35 | HasSubstring(char const* substring) : substring(substring) {} |
| 4779 | 36 | HasSubstring(std::string const& substring) : substring{substring.c_str()} {} | ||
| 4780 | 33 | 37 | ||
| 4781 | 34 | friend::testing::AssertionResult operator,(std::string const& target, HasSubstring const& match) | 38 | friend::testing::AssertionResult operator,(std::string const& target, HasSubstring const& match) |
| 4782 | 35 | { | 39 | { |
| 4783 | @@ -50,18 +54,31 @@ | |||
| 4784 | 50 | 54 | ||
| 4785 | 51 | #define EXPECT_THAT(target, condition) EXPECT_TRUE((target, condition)) | 55 | #define EXPECT_THAT(target, condition) EXPECT_TRUE((target, condition)) |
| 4786 | 52 | 56 | ||
| 4791 | 53 | char const* const nonexistent_library = "nonexistent_library"; | 57 | class SharedLibrary : public testing::Test |
| 4792 | 54 | char const* const existing_library = "libmirplatformgraphics.so"; | 58 | { |
| 4793 | 55 | char const* const nonexistent_function = "nonexistent_library"; | 59 | public: |
| 4794 | 56 | char const* const existing_function = "create_platform"; | 60 | SharedLibrary() |
| 4795 | 61 | : nonexistent_library{"imma_totally_not_a_library"}, | ||
| 4796 | 62 | existing_library{mtf::library_path() + "/client-platform-mesa.so"}, | ||
| 4797 | 63 | nonexistent_function{"yo_dawg"}, | ||
| 4798 | 64 | existing_function{"create_client_platform"} | ||
| 4799 | 65 | { | ||
| 4800 | 66 | } | ||
| 4801 | 67 | |||
| 4802 | 68 | std::string const nonexistent_library; | ||
| 4803 | 69 | std::string const existing_library; | ||
| 4804 | 70 | std::string const nonexistent_function; | ||
| 4805 | 71 | std::string const existing_function; | ||
| 4806 | 72 | }; | ||
| 4807 | 73 | |||
| 4808 | 57 | } | 74 | } |
| 4809 | 58 | 75 | ||
| 4811 | 59 | TEST(SharedLibrary, load_nonexistent_library_fails) | 76 | TEST_F(SharedLibrary, load_nonexistent_library_fails) |
| 4812 | 60 | { | 77 | { |
| 4813 | 61 | EXPECT_THROW({ mir::SharedLibrary nonexistent(nonexistent_library); }, std::runtime_error); | 78 | EXPECT_THROW({ mir::SharedLibrary nonexistent(nonexistent_library); }, std::runtime_error); |
| 4814 | 62 | } | 79 | } |
| 4815 | 63 | 80 | ||
| 4817 | 64 | TEST(SharedLibrary, load_nonexistent_library_fails_with_useful_info) | 81 | TEST_F(SharedLibrary, load_nonexistent_library_fails_with_useful_info) |
| 4818 | 65 | { | 82 | { |
| 4819 | 66 | try | 83 | try |
| 4820 | 67 | { | 84 | { |
| 4821 | @@ -76,19 +93,19 @@ | |||
| 4822 | 76 | } | 93 | } |
| 4823 | 77 | } | 94 | } |
| 4824 | 78 | 95 | ||
| 4826 | 79 | TEST(SharedLibrary, load_valid_library_works) | 96 | TEST_F(SharedLibrary, load_valid_library_works) |
| 4827 | 80 | { | 97 | { |
| 4828 | 81 | mir::SharedLibrary existing(existing_library); | 98 | mir::SharedLibrary existing(existing_library); |
| 4829 | 82 | } | 99 | } |
| 4830 | 83 | 100 | ||
| 4832 | 84 | TEST(SharedLibrary, load_nonexistent_function_fails) | 101 | TEST_F(SharedLibrary, load_nonexistent_function_fails) |
| 4833 | 85 | { | 102 | { |
| 4834 | 86 | mir::SharedLibrary existing(existing_library); | 103 | mir::SharedLibrary existing(existing_library); |
| 4835 | 87 | 104 | ||
| 4836 | 88 | EXPECT_THROW({ existing.load_function<void(*)()>(nonexistent_function); }, std::runtime_error); | 105 | EXPECT_THROW({ existing.load_function<void(*)()>(nonexistent_function); }, std::runtime_error); |
| 4837 | 89 | } | 106 | } |
| 4838 | 90 | 107 | ||
| 4840 | 91 | TEST(SharedLibrary, load_nonexistent_function_fails_with_useful_info) | 108 | TEST_F(SharedLibrary, load_nonexistent_function_fails_with_useful_info) |
| 4841 | 92 | { | 109 | { |
| 4842 | 93 | mir::SharedLibrary existing(existing_library); | 110 | mir::SharedLibrary existing(existing_library); |
| 4843 | 94 | 111 | ||
| 4844 | @@ -106,7 +123,7 @@ | |||
| 4845 | 106 | } | 123 | } |
| 4846 | 107 | } | 124 | } |
| 4847 | 108 | 125 | ||
| 4849 | 109 | TEST(SharedLibrary, load_valid_function_works) | 126 | TEST_F(SharedLibrary, load_valid_function_works) |
| 4850 | 110 | { | 127 | { |
| 4851 | 111 | mir::SharedLibrary existing(existing_library); | 128 | mir::SharedLibrary existing(existing_library); |
| 4852 | 112 | existing.load_function<void(*)()>(existing_function); | 129 | existing.load_function<void(*)()>(existing_function); |
| 4853 | 113 | 130 | ||
| 4854 | === added directory 'tests/unit-tests/test_data' | |||
| 4855 | === added file 'tests/unit-tests/test_data/libamd64.so' | |||
| 4856 | 114 | Binary files tests/unit-tests/test_data/libamd64.so 1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libamd64.so 2014-08-29 01:18:58 +0000 differ | 131 | Binary files tests/unit-tests/test_data/libamd64.so 1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libamd64.so 2014-08-29 01:18:58 +0000 differ |
| 4857 | === added file 'tests/unit-tests/test_data/libarmhf.so' | |||
| 4858 | 115 | Binary files tests/unit-tests/test_data/libarmhf.so 1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libarmhf.so 2014-08-29 01:18:58 +0000 differ | 132 | Binary files tests/unit-tests/test_data/libarmhf.so 1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libarmhf.so 2014-08-29 01:18:58 +0000 differ |
| 4859 | === added file 'tests/unit-tests/test_shared_library_prober.cpp' | |||
| 4860 | --- tests/unit-tests/test_shared_library_prober.cpp 1970-01-01 00:00:00 +0000 | |||
| 4861 | +++ tests/unit-tests/test_shared_library_prober.cpp 2014-08-29 01:18:58 +0000 | |||
| 4862 | @@ -0,0 +1,165 @@ | |||
| 4863 | 1 | /* | ||
| 4864 | 2 | * Copyright © 2014 Canonical Ltd. | ||
| 4865 | 3 | * | ||
| 4866 | 4 | * This program is free software: you can redistribute it and/or modify it | ||
| 4867 | 5 | * under the terms of the GNU General Public License version 3, | ||
| 4868 | 6 | * as published by the Free Software Foundation. | ||
| 4869 | 7 | * | ||
| 4870 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 4871 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 4872 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 4873 | 11 | * GNU General Public License for more details. | ||
| 4874 | 12 | * | ||
| 4875 | 13 | * You should have received a copy of the GNU General Public License | ||
| 4876 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 4877 | 15 | * | ||
| 4878 | 16 | * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
| 4879 | 17 | */ | ||
| 4880 | 18 | |||
| 4881 | 19 | #include "mir/shared_library_prober.h" | ||
| 4882 | 20 | |||
| 4883 | 21 | #include "mir_test_framework/executable_path.h" | ||
| 4884 | 22 | |||
| 4885 | 23 | #include <system_error> | ||
| 4886 | 24 | |||
| 4887 | 25 | #include <gtest/gtest.h> | ||
| 4888 | 26 | #include <gmock/gmock.h> | ||
| 4889 | 27 | |||
| 4890 | 28 | namespace mtf = mir_test_framework; | ||
| 4891 | 29 | |||
| 4892 | 30 | namespace | ||
| 4893 | 31 | { | ||
| 4894 | 32 | |||
| 4895 | 33 | class MockSharedLibraryProberReport : public mir::SharedLibraryProberReport | ||
| 4896 | 34 | { | ||
| 4897 | 35 | public: | ||
| 4898 | 36 | MOCK_METHOD1(probing_path, void(boost::filesystem::path const&)); | ||
| 4899 | 37 | MOCK_METHOD2(probing_failed, void(boost::filesystem::path const&, std::exception const&)); | ||
| 4900 | 38 | MOCK_METHOD1(loading_library, void(boost::filesystem::path const&)); | ||
| 4901 | 39 | MOCK_METHOD2(loading_failed, void(boost::filesystem::path const&, std::exception const&)); | ||
| 4902 | 40 | }; | ||
| 4903 | 41 | |||
| 4904 | 42 | class SharedLibraryProber : public testing::Test | ||
| 4905 | 43 | { | ||
| 4906 | 44 | public: | ||
| 4907 | 45 | SharedLibraryProber() | ||
| 4908 | 46 | : library_path{mtf::executable_path() + "/test_data"} | ||
| 4909 | 47 | { | ||
| 4910 | 48 | } | ||
| 4911 | 49 | |||
| 4912 | 50 | std::string const library_path; | ||
| 4913 | 51 | testing::NiceMock<MockSharedLibraryProberReport> null_report; | ||
| 4914 | 52 | }; | ||
| 4915 | 53 | |||
| 4916 | 54 | } | ||
| 4917 | 55 | |||
| 4918 | 56 | TEST_F(SharedLibraryProber, ReturnsNonEmptyListForPathContainingLibraries) | ||
| 4919 | 57 | { | ||
| 4920 | 58 | auto libraries = mir::libraries_for_path(library_path, null_report); | ||
| 4921 | 59 | EXPECT_GE(libraries.size(), 1); | ||
| 4922 | 60 | } | ||
| 4923 | 61 | |||
| 4924 | 62 | TEST_F(SharedLibraryProber, RaisesExceptionForNonexistentPath) | ||
| 4925 | 63 | { | ||
| 4926 | 64 | EXPECT_THROW(mir::libraries_for_path("/a/path/that/certainly/doesnt/exist", null_report), | ||
| 4927 | 65 | std::system_error); | ||
| 4928 | 66 | } | ||
| 4929 | 67 | |||
| 4930 | 68 | TEST_F(SharedLibraryProber, NonExistentPathRaisesENOENTError) | ||
| 4931 | 69 | { | ||
| 4932 | 70 | try | ||
| 4933 | 71 | { | ||
| 4934 | 72 | mir::libraries_for_path("/a/path/that/certainly/doesnt/exist", null_report); | ||
| 4935 | 73 | } | ||
| 4936 | 74 | catch (std::system_error &err) | ||
| 4937 | 75 | { | ||
| 4938 | 76 | EXPECT_EQ(err.code(), std::error_code(ENOENT, std::system_category())); | ||
| 4939 | 77 | } | ||
| 4940 | 78 | } | ||
| 4941 | 79 | |||
| 4942 | 80 | TEST_F(SharedLibraryProber, PathWithNoSharedLibrariesReturnsEmptyList) | ||
| 4943 | 81 | { | ||
| 4944 | 82 | // /usr is guaranteed to exist, and shouldn't contain any libraries | ||
| 4945 | 83 | auto libraries = mir::libraries_for_path("/usr", null_report); | ||
| 4946 | 84 | EXPECT_EQ(0, libraries.size()); | ||
| 4947 | 85 | } | ||
| 4948 | 86 | |||
| 4949 | 87 | TEST_F(SharedLibraryProber, LogsStartOfProbe) | ||
| 4950 | 88 | { | ||
| 4951 | 89 | using namespace testing; | ||
| 4952 | 90 | testing::NiceMock<MockSharedLibraryProberReport> report; | ||
| 4953 | 91 | |||
| 4954 | 92 | EXPECT_CALL(report, probing_path(testing::Eq(library_path))); | ||
| 4955 | 93 | |||
| 4956 | 94 | mir::libraries_for_path(library_path, report); | ||
| 4957 | 95 | } | ||
| 4958 | 96 | |||
| 4959 | 97 | TEST_F(SharedLibraryProber, LogsForNonexistentPath) | ||
| 4960 | 98 | { | ||
| 4961 | 99 | using namespace testing; | ||
| 4962 | 100 | NiceMock<MockSharedLibraryProberReport> report; | ||
| 4963 | 101 | |||
| 4964 | 102 | EXPECT_CALL(report, probing_path(testing::Eq("/yo/dawg/I/heard/you/liked/slashes"))); | ||
| 4965 | 103 | |||
| 4966 | 104 | EXPECT_THROW(mir::libraries_for_path("/yo/dawg/I/heard/you/liked/slashes", report), | ||
| 4967 | 105 | std::runtime_error); | ||
| 4968 | 106 | } | ||
| 4969 | 107 | |||
| 4970 | 108 | TEST_F(SharedLibraryProber, LogsFailureForNonexistentPath) | ||
| 4971 | 109 | { | ||
| 4972 | 110 | using namespace testing; | ||
| 4973 | 111 | NiceMock<MockSharedLibraryProberReport> report; | ||
| 4974 | 112 | |||
| 4975 | 113 | EXPECT_CALL(report, probing_failed(Eq("/yo/dawg/I/heard/you/liked/slashes"), _)); | ||
| 4976 | 114 | |||
| 4977 | 115 | EXPECT_THROW(mir::libraries_for_path("/yo/dawg/I/heard/you/liked/slashes", report), | ||
| 4978 | 116 | std::runtime_error); | ||
| 4979 | 117 | |||
| 4980 | 118 | } | ||
| 4981 | 119 | |||
| 4982 | 120 | TEST_F(SharedLibraryProber, LogsNoLibrariesForPathWithoutLibraries) | ||
| 4983 | 121 | { | ||
| 4984 | 122 | using namespace testing; | ||
| 4985 | 123 | NiceMock<MockSharedLibraryProberReport> report; | ||
| 4986 | 124 | |||
| 4987 | 125 | EXPECT_CALL(report, loading_library(_)).Times(0); | ||
| 4988 | 126 | |||
| 4989 | 127 | mir::libraries_for_path("/usr", report); | ||
| 4990 | 128 | } | ||
| 4991 | 129 | |||
| 4992 | 130 | namespace | ||
| 4993 | 131 | { | ||
| 4994 | 132 | MATCHER_P(FilenameMatches, path, "") | ||
| 4995 | 133 | { | ||
| 4996 | 134 | *result_listener << "where the path is " << arg; | ||
| 4997 | 135 | return boost::filesystem::path(path).filename() == arg.filename(); | ||
| 4998 | 136 | } | ||
| 4999 | 137 | } | ||
| 5000 | 138 | |||
The diff has been truncated for viewing.
FAILED: Continuous integration, rev:1801
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://