lp:mir/0.11
Created by
Robert Carr
and last modified
- Get this branch:
- bzr branch lp:mir/0.11
Members of
Mir development team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Alberto Aguirre (community): Disapprove
- Daniel van Vugt: Needs Fixing
- PS Jenkins bot (community): Approve (continuous-integration)
-
Diff: 1850 lines (+470/-173)53 files modifieddebian/changelog (+23/-0)
debian/control (+10/-10)
debian/libmirserver30.install (+1/-1)
debian/mir-client-platform-android2.install (+1/-1)
debian/mir-client-platform-mesa2.install (+1/-1)
debian/mir-platform-graphics-android1.install (+1/-1)
debian/mir-platform-graphics-mesa1.install (+1/-1)
include/server/mir/time/timer.h (+28/-4)
server-ABI-sha1sums (+1/-1)
src/CMakeLists.txt (+5/-2)
src/client/CMakeLists.txt (+1/-2)
src/common/sharedlibrary/shared_library_prober.cpp (+9/-1)
src/include/server/mir/compositor/frame_dropping_policy_factory.h (+22/-5)
src/include/server/mir/glib_main_loop.h (+11/-6)
src/include/server/mir/glib_main_loop_sources.h (+3/-1)
src/platform/graphics/platform_probe.cpp (+1/-1)
src/platforms/CMakeLists.txt (+8/-1)
src/platforms/android/client/CMakeLists.txt (+1/-0)
src/platforms/android/server/CMakeLists.txt (+1/-0)
src/platforms/mesa/client/CMakeLists.txt (+1/-0)
src/platforms/mesa/server/CMakeLists.txt (+1/-0)
src/server/CMakeLists.txt (+1/-1)
src/server/compositor/buffer_queue.cpp (+28/-13)
src/server/compositor/buffer_queue.h (+12/-4)
src/server/compositor/timeout_frame_dropping_policy_factory.cpp (+17/-9)
src/server/compositor/timeout_frame_dropping_policy_factory.h (+6/-2)
src/server/glib_main_loop.cpp (+23/-6)
src/server/glib_main_loop_sources.cpp (+15/-3)
src/server/symbols.map (+1/-1)
tests/acceptance-tests/test_symbols_required_by_mesa.cpp (+1/-1)
tests/include/mir_test_doubles/mock_frame_dropping_policy_factory.h (+23/-4)
tests/include/mir_test_doubles/mock_main_loop.h (+14/-6)
tests/include/mir_test_doubles/mock_timer.h (+7/-5)
tests/include/mir_test_doubles/stub_frame_dropping_policy_factory.h (+7/-3)
tests/include/mir_test_doubles/stub_timer.h (+3/-3)
tests/include/mir_test_doubles/triggered_main_loop.h (+1/-1)
tests/include/mir_test_framework/client_platform_factory.h (+2/-2)
tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp (+12/-4)
tests/mir_test_doubles/mock_timer.cpp (+38/-15)
tests/mir_test_doubles/triggered_main_loop.cpp (+3/-2)
tests/mir_test_framework/CMakeLists.txt (+2/-0)
tests/mir_test_framework/executable_path.cpp (+12/-2)
tests/unit-tests/client/test_client_platform.cpp (+2/-2)
tests/unit-tests/client/test_probing_client_platform_factory.cpp (+2/-2)
tests/unit-tests/compositor/test_buffer_queue.cpp (+10/-1)
tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp (+36/-9)
tests/unit-tests/graphics/android/test_platform.cpp (+2/-2)
tests/unit-tests/graphics/mesa/test_platform.cpp (+2/-2)
tests/unit-tests/graphics/test_platform_prober.cpp (+2/-2)
tests/unit-tests/shared_library_test.cpp (+1/-1)
tests/unit-tests/test_glib_main_loop.cpp (+29/-26)
tests/unit-tests/test_raii.cpp (+20/-0)
tests/unit-tests/test_shared_library_prober.cpp (+5/-0)
Related source package recipes
Branch information
Recent revisions
- 2294. By Daniel van Vugt
-
Revert back to r2289 removing unreleased experiments.
So this maintenance branch now correctly reflects what's actually been
released. - 2291. By Alberto Aguirre
-
Fix deadlock caused by lock ordering issues.
The framedropping policy acquires an internal lock while invoking the user callback. BufferQueue calls framedrop policy methods while holding its own lock; the callback implementation given to the policy also acquires the same lock which results in a classic lock ordering deadlock issue.
To avoid such lock order issues, the framedrop policy and alarm factory interfaces expose an additional API to allow users to pass in lock/unlock functions, which can then be used by the callback dispatching context to preserve lock ordering.
Backported from lp:mir r2335
- 2290. By Alexandros Frantzis
-
platforms: Use the ABI version in platform library names and packages.
Backported from lp:mir, r2333
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mir
