lp://staging/~andreas-pokorny/mir/split-main-loop-and-fix-races
Created by
Andreas Pokorny
and last modified
- Get this branch:
- bzr branch lp://staging/~andreas-pokorny/mir/split-main-loop-and-fix-races
Only
Andreas Pokorny
can upload to this branch. If you are
Andreas Pokorny
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp://staging/mir
- Alberto Aguirre (community): Needs Fixing
- Alan Griffiths: Needs Fixing
- PS Jenkins bot (community): Approve (continuous-integration)
- Alexandros Frantzis (community): Needs Fixing
- Robert Carr (community): Approve
- Andreas Pokorny (community): Approve
-
Diff: 3020 lines (+1675/-617)31 files modifiedinclude/platform/mir/graphics/event_handler_register.h (+3/-0)
include/server/mir/default_server_configuration.h (+5/-0)
include/server/mir/loop.h (+37/-0)
include/server/mir/main_loop.h (+1/-2)
include/server/mir/server_configuration.h (+2/-0)
include/server/mir/time/timer_loop.h (+37/-0)
include/test/mir_test_doubles/mock_event_handler_register.h (+53/-0)
include/test/mir_test_doubles/mock_loop.h (+44/-0)
include/test/mir_test_doubles/mock_server_action_queue.h (+44/-0)
src/platform/graphics/mesa/display.cpp (+1/-0)
src/server/CMakeLists.txt (+3/-0)
src/server/asio_main_loop.cpp (+88/-307)
src/server/asio_main_loop.h (+21/-27)
src/server/asio_server_action_queue.cpp (+91/-0)
src/server/asio_server_action_queue.h (+58/-0)
src/server/asio_timer_service.cpp (+260/-0)
src/server/asio_timer_service.h (+58/-0)
src/server/compositor/default_configuration.cpp (+1/-1)
src/server/default_server_configuration.cpp (+47/-2)
src/server/display_server.cpp (+14/-1)
src/server/synchronous_server_action.cpp (+50/-0)
src/server/synchronous_server_action.h (+48/-0)
tests/acceptance-tests/test_display_configuration.cpp (+1/-0)
tests/integration-tests/test_display_server_main_loop_events.cpp (+44/-0)
tests/unit-tests/CMakeLists.txt (+3/-0)
tests/unit-tests/graphics/mesa/test_display.cpp (+5/-17)
tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp (+2/-16)
tests/unit-tests/test_asio_main_loop.cpp (+45/-244)
tests/unit-tests/test_asio_server_action_queue.cpp (+219/-0)
tests/unit-tests/test_asio_timer_service.cpp (+312/-0)
tests/unit-tests/test_synchronous_server_action.cpp (+78/-0)
Branch information
Recent revisions
- 1662. By Andreas Pokorny
-
Removed mir::timer:
:TimerService the run/stop part of the interface is now represented by mir::Loop
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/mir/ubuntu