lp:~andreas-pokorny/mir/split-main-loop-and-fix-races

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:mir

Alberto Aguirre (community): Needs Fixing on 2014-06-23

Alan Griffiths: Needs Fixing on 2014-06-18

PS Jenkins bot (community): Approve (continuous-integration) on 2014-06-17

Alexandros Frantzis (community): Needs Fixing on 2014-06-16

Robert Carr (community): Approve on 2014-06-16

Andreas Pokorny (community): Approve on 2014-05-28

Diff: 3020 lines (+1675/-617)

31 files modified

include/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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1666. By Andreas Pokorny on 2014-06-16

review findings

1665. By Andreas Pokorny on 2014-06-16

unnecessary namespace

1664. By Andreas Pokorny on 2014-06-16

merged lp:mir/development-branch

1663. By Andreas Pokorny on 2014-06-16

merged lp:mir/development-branch

1662. By Andreas Pokorny on 2014-06-15

Removed mir::timer::TimerService the run/stop part of the interface is now represented by mir::Loop

1661. By Andreas Pokorny on 2014-06-13

typo

1660. By Andreas Pokorny on 2014-06-10

restore fix for alarm unit tests

1659. By Andreas Pokorny on 2014-06-10

fixes strange indent

1658. By Andreas Pokorny on 2014-06-10

merged devel, and addressed findings

1657. By Andreas Pokorny on 2014-05-31

Explain synchronizatio aspects of main loop and fix c++ style guide issues