lp:~alan-griffiths/mir/experimenting-with-ci

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:mir

PS Jenkins bot (community): Approve (continuous-integration) on 2014-07-11

Mir development team: Pending requested 2014-07-11

Diff: 1267 lines (+3/-623)

42 files modified

include/client/mir_toolkit/mir_prompt_session.h (+0/-10)
include/server/mir/frontend/session_mediator_report.h (+0/-2)
include/server/mir/frontend/shell.h (+0/-2)
include/server/mir/scene/prompt_session_manager.h (+0/-14)
include/server/mir/shell/session_coordinator_wrapper.h (+0/-4)
include/shared/mir_toolkit/client_types.h (+0/-9)
include/test/mir_test/test_protobuf_client.h (+0/-5)
include/test/mir_test_doubles/mock_shell.h (+0/-3)
include/test/mir_test_doubles/null_prompt_session_manager.h (+0/-9)
include/test/mir_test_doubles/stub_shell.h (+0/-5)
src/client/mir_prompt_session.cpp (+0/-31)
src/client/mir_prompt_session.h (+0/-4)
src/client/mir_prompt_session_api.cpp (+0/-39)
src/server/frontend/no_prompt_shell.cpp (+0/-7)
src/server/frontend/no_prompt_shell.h (+0/-4)
src/server/frontend/protobuf_message_processor.cpp (+0/-4)
src/server/frontend/session_mediator.cpp (+0/-24)
src/server/frontend/session_mediator.h (+0/-5)
src/server/frontend/shell_wrapper.cpp (+0/-7)
src/server/frontend/shell_wrapper.h (+0/-4)
src/server/report/logging/session_mediator_report.cpp (+0/-5)
src/server/report/logging/session_mediator_report.h (+0/-2)
src/server/report/lttng/session_mediator_report.cpp (+0/-5)
src/server/report/lttng/session_mediator_report.h (+0/-1)
src/server/report/lttng/session_mediator_report_tp.h (+0/-10)
src/server/report/null/session_mediator_report.cpp (+0/-4)
src/server/report/null/session_mediator_report.h (+0/-2)
src/server/scene/prompt_session_container.cpp (+0/-43)
src/server/scene/prompt_session_container.h (+0/-37)
src/server/scene/prompt_session_manager_impl.cpp (+0/-45)
src/server/scene/prompt_session_manager_impl.h (+0/-12)
src/server/scene/session_manager.cpp (+0/-11)
src/server/scene/session_manager.h (+0/-2)
src/server/shell/session_coordinator_wrapper.cpp (+0/-7)
src/shared/protobuf/mir_protobuf.proto (+0/-5)
tests/acceptance-tests/test_nested_mir.cpp (+0/-1)
tests/acceptance-tests/test_prompt_session_client_api.cpp (+2/-59)
tests/integration-tests/frontend/test_application_mediator_report.cpp (+0/-61)
tests/mir_test_doubles/test_protobuf_client.cpp (+0/-8)
tests/unit-tests/client/test_mir_prompt_session.cpp (+0/-16)
tests/unit-tests/scene/test_prompt_session_container.cpp (+0/-44)
tests/unit-tests/scene/test_prompt_session_manager.cpp (+1/-51)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1767. By Alan Griffiths on 2014-07-11

Merge the guts of lp:~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync

1766. By Daniel van Vugt on 2014-07-11

Ensure AlarmImpl is not locked during callbacks to arbitrary user code so
that it can't form a deadlock with the caller's own mutexes. (LP: #1339700). Fixes: https://bugs.launchpad.net/bugs/1339700.

Approved by Andreas Pokorny, Alan Griffiths, PS Jenkins bot.

1765. By Daniel van Vugt on 2014-07-11

Fix wrong count of BufferQueue.current_buffer_users. This hasn't yet caused
any visible bugs but it is an issue which affects future enhancements to
to BufferQueue, so best to fix it.

Approved by Alan Griffiths, PS Jenkins bot.

1764. By Alan Griffiths on 2014-07-10

shared. scene: Introduce a generic listener collection.
.

Approved by PS Jenkins bot, Alberto Aguirre, Kevin DuBois, Alexandros Frantzis.

1763. By Kevin DuBois on 2014-07-10

client: update the cached client side buffers with the buffer package. This will let android servers share a fence/sync fd on every buffer over ipc. The new function currently doesn't do anything on either platform, but will soon.

Approved by PS Jenkins bot, Alexandros Frantzis.

1762. By Daniel van Vugt on 2014-07-10

examples: Ensure macro parameters are mathematically distributive.

Approved by Alexandros Frantzis, PS Jenkins bot.

1761. By Daniel van Vugt on 2014-07-10

mir_demo_client_multiwin: Premultiply by alpha to produce correctly
composited colours following changes to the blending equation in r1687.
(LP: #1339471). Fixes: https://bugs.launchpad.net/bugs/1339471.

Approved by Alexandros Frantzis, PS Jenkins bot.

1760. By Thomas Voß on 2014-07-10

Explicitly select g++-4.9 to prevent from ABI breaks. (LP: #1329089). Fixes: https://bugs.launchpad.net/bugs/1329089.

Approved by PS Jenkins bot, Alan Griffiths.

1759. By Alan Griffiths on 2014-07-10

examples: write the main() in minimal_server.cpp the way client code should be written.

Approved by Kevin DuBois, PS Jenkins bot, Alexandros Frantzis.

1758. By Daniel van Vugt on 2014-07-10

Modify comments and tests to reflect the new reality where apparently bypass
doesn't need any more than two buffers. This seems to have come about from
server changes where buffers are acquired by clients asynchronously and
we allow some time each swap where the client owns zero buffers. Thus the
original deadlock which required 3 buffers to avoid does not seem to exist
any more. I think.

This doesn't change the logic in any way. But since it can be done separately
to any logic changes I'm proposing the docs/test changes early.

Approved by Kevin DuBois, Alberto Aguirre, Alexandros Frantzis, Alan Griffiths, PS Jenkins bot.