Merge lp:~vanvugt/mir/fix-1653658 into lp:mir
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3914 |
Proposed branch: | lp:~vanvugt/mir/fix-1653658 |
Merge into: | lp:mir |
Diff against target: |
312 lines (+110/-11) 11 files modified
src/client/mir_connection.cpp (+8/-3) src/client/rpc/mir_basic_rpc_channel.cpp (+23/-8) src/client/rpc/mir_basic_rpc_channel.h (+8/-0) src/client/rpc/mir_protobuf_rpc_channel.cpp (+24/-0) src/client/rpc/mir_protobuf_rpc_channel.h (+3/-0) tests/acceptance-tests/test_client_library.cpp (+14/-0) tests/include/mir/test/doubles/stub_connection_configuration.h (+6/-0) tests/unit-tests/client/test_client_mir_surface.cpp (+6/-0) tests/unit-tests/client/test_mir_connection.cpp (+9/-0) tests/unit-tests/client/test_mir_render_surface.cpp (+3/-0) tests/unit-tests/platforms/android/client/test_android_client_platform.cpp (+6/-0) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1653658 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Chris Halse Rogers | Approve | ||
Mir development team | Pending | ||
Review via email: mp+314204@code.launchpad.net |
Commit message
Fix race between MirConnection's destructor and its RPC callbacks.
(LP: #1653658)
This ensures RPC callbacks never occur (so never touch the MirConnection) after destruction of the MirConnection has commenced.
To post a comment you must log in.
FAILED: Continuous integration, rev:3911 /mir-jenkins. ubuntu. com/job/ mir-ci/ 2541/ /mir-jenkins. ubuntu. com/job/ build-mir/ 3306/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/3373 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 3365 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 3365 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 3365 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 3335 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 3335/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3335/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 3335/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3335/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3335/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3335 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3335/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3335 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3335/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 2541/rebuild
https:/