Mir

Merge lp://qastaging/~afrantzis/mir/glib-main-loop-default into lp://qastaging/mir

  1. glib-main-loop-default
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alberto Aguirre
Approved revision: no longer in the source branch.
Merged at revision: 2072
Proposed branch: lp://qastaging/~afrantzis/mir/glib-main-loop-default
Merge into: lp://qastaging/mir
Prerequisite: lp://qastaging/~afrantzis/mir/glib-main-loop-exception-handling
Diff against target: 206 lines (+29/-24)
9 files modified
include/platform/mir/options/configuration.h (+1/-0)
include/server/mir/default_server_configuration.h (+1/-2)
platform-ABI-sha1sums (+1/-1)
server-ABI-sha1sums (+2/-2)
src/include/server/mir/glib_main_loop.h (+12/-12)
src/platform/options/default_configuration.cpp (+3/-1)
src/platform/symbols.map (+1/-0)
src/server/default_server_configuration.cpp (+6/-4)
tests/unit-tests/graphics/mesa/test_display.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/glib-main-loop-default
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Cemil Azizoglu (community) Approve
Alan Griffiths Approve
Kevin DuBois (community) Approve
Review via email: mp+241963@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-11-17.

Commit message

server: Use the GLibMainLoop implementation by default

This MP also adds an option of using the AsioMainLoop implementation (--use-asio-main-loop or MIR_SERVER_USE_ASIO_MAIN_LOOP) for easier comparative testing.

Description of the change

server: Use the GLibMainLoop implementation by default

This MP also adds an option of using the AsioMainLoop implementation (--use-asio-main-loop or MIR_SERVER_USE_ASIO_MAIN_LOOP) for easier comparative testing.

The plan is to completely remove the AsioMainLoop code and option when we gain sufficient confidence in the GLib-based implementation.

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

looks good by me, perhaps though we could indicate in the help string for the option that the option will go away soon.

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

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2063
http://jenkins.qa.ubuntu.com/job/mir-ci/2125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/151
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/131/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2125/rebuild

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

FAILED: Continuous integration, rev:2065
http://jenkins.qa.ubuntu.com/job/mir-ci/2148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/180
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/160/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2148/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> The following tests FAILED:
> 3 - server-ABI-unchanged (Failed)
> 6 - platform-ABI-unchanged (Failed)

Syncing with lp:mir should fix this.

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> Syncing with lp:mir should fix this.

Turns out I had forgotten to commit the options/configuration.h updated sha1sum.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2067
http://jenkins.qa.ubuntu.com/job/mir-ci/2150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/163
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3435
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15953

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2150/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Looks good, tested with unity8 stack on a Nexus 4.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Tested. Works fine with or without asio option set.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/867/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/192
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/192/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/47
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/172
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3442
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15971

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

^-- Couldn't replicate it locally. Let's try TA'ing again.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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