Mir

Merge lp://qastaging/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync into lp://qastaging/mir

Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1773
Proposed branch: lp://qastaging/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync
Merge into: lp://qastaging/mir
Diff against target: 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)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/rm-rf-mir_prompt_session_add_prompt_provider_sync
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Alberto Aguirre (community) Approve
Kevin DuBois (community) Needs Fixing
Review via email: mp+226177@code.qastaging.launchpad.net

Commit message

client API, frontend, scene: remove support for mir_prompt_session_add_prompt_provider_sync()

Following discussions about security concerns and trusted prompt session lifecycle this function is both problematic and unnecessary. Helpers should be using mir_prompt_session_new_fds_for_prompt_providers() instead.

Description of the change

client API, frontend, scene: remove support for mir_prompt_session_add_prompt_provider_sync()

Following discussions about security concerns and trusted prompt session lifecycle this function is both problematic and unnecessary. Helpers should be using mir_prompt_session_new_fds_for_prompt_providers() instead.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

+3/-623 yay

We're changing client API with a removal, so we should probably bump the number. (although an argument could be made that this is being pedantic at the expense of being practical, given how widely the trust stuff is used)

Revision history for this message
Kevin DuBois (kdub) :
review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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 :

> [ RUN ] GLMark2Test.benchmark_fullscreen_default
> Build timed out (after 60 minutes). Marking the build as failed.

Mako problems? Rebuilding...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Red diffs, I like that... :)

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> > [ RUN ] GLMark2Test.benchmark_fullscreen_default
> > Build timed out (after 60 minutes). Marking the build as failed.
>
> Mako problems? Rebuilding...

I really can't imagine why this branch would be the cause of a build timeout on mako. But twice is very suggestive.

Syncing to trunk will cause a third rebuild - we'll see what happens then. (In the meantime I'll charge & update my phone.)

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 :

Latest theory: the problem is caused because glmark-mir is build against mir ABI 8 somehow confusion arises as a result of trying to run it from a test built against ABI 9.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Reverted client ABI bump as that causes CI problem.

See also https://code.launchpad.net/~alan-griffiths/mir/experimenting-with-ci2/+merge/226590 (I'll raise a bug for that).

Nobody uses this API so we should "get away" with it for now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

For MPs against devel, we should not bump server/client ABIs, anyways. Bumps should really be made at the release time, aggregating bumps from multiple commits into one. At least that's the convention we have been following.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches