Mir

Merge lp:~alan-griffiths/mir/tidy-code into lp:mir

Proposed by Alan Griffiths on 2017-09-06
Status: Merged
Approved by: Brandon Schaefer on 2017-09-06
Approved revision: no longer in the source branch.
Merged at revision: 4242
Proposed branch: lp:~alan-griffiths/mir/tidy-code
Merge into: lp:mir
Diff against target: 93 lines (+12/-26)
1 file modified
src/server/display_server.cpp (+12/-26)
To merge this branch: bzr merge lp:~alan-griffiths/mir/tidy-code
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-09-06 Approve on 2017-09-06
Mir CI Bot continuous-integration Approve on 2017-09-06
Review via email: mp+330275@code.launchpad.net

Commit message

Remove workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258. (This was fixed in 4.9.4, 5.3 and 6.0, it no longer affects any platform we target.)

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4241
https://mir-jenkins.ubuntu.com/job/mir-ci/3633/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4969/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5185
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5185
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5185
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5008/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5008/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5008/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5008/artifact/output/*zip*/output.zip
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5008/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5008/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5008/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5008
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5008/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3633/rebuild

review: Needs Fixing (continuous-integration)
Alan Griffiths (alan-griffiths) wrote :

Us or CI infrastructure I wonder?

12:52:27 11: [ RUN ] ClientLibrary.creates_multiple_surfaces
12:52:27 11: [2017-09-06 12:52:27.196726] mirserver: Starting
12:52:27 11: [2017-09-06 12:52:27.205119] mirserver: Selected driver: mir:stub-graphics (version 1.0.0)
12:52:27 11: [2017-09-06 12:52:27.798359] mirserver: Using software cursor
12:52:27 11: [2017-09-06 12:52:27.878386] mirserver: Selected input driver: mir:stub-input (version: 1.0.0)
12:52:27 11: [2017-09-06 12:52:27.943187] mirserver: Mir version 1.0.0
12:52:27 11: [2017-09-06 12:52:27.987468] mirserver: Initial display configuration:
12:52:27 11: [2017-09-06 12:52:27.988778] mirserver: CMakeFiles CTestTestfile.cmake Makefile cmake_install.cmake mir_acceptance_tests_precompiled.hpp.gch precompiled.hpp.compileflags precompiled.hpp.compileflags.processed Output 1: VGA connected, used
12:52:28 11: [2017-09-06 12:52:27.989538] mirserver: . |_ Physical size 0.0" 0x0mm
12:52:28 11: [2017-09-06 12:52:27.989987] mirserver: . |_ Power is on
12:52:28 11: [2017-09-06 12:52:27.990486] mirserver: . |_ Current mode 1600x1600 60.00Hz
12:52:28 11: [2017-09-06 12:52:27.990975] mirserver: . |_ Preferred mode 1600x1600 60.00Hz
12:52:28 11: [2017-09-06 12:52:27.991395] mirserver: . |_ Orientation normal
12:52:28 11: [2017-09-06 12:52:27.991842] mirserver: . |_ Logical size 1600x1600
12:52:28 11: [2017-09-06 12:52:27.993555] mirserver: . |_ Logical position +0+0
12:52:28 11: [2017-09-06 12:52:27.994131] mirserver: . |_ Scaling factor: 1.00
15:18:36 Build timed out (after 180 minutes). Marking the build as aborted.
15:18:36 Build was aborted
15:18:36 Archiving artifacts

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4241
https://mir-jenkins.ubuntu.com/job/mir-ci/3635/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4971
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5199
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5187
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5187
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5187
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5010/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5010
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5010/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3635/rebuild

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Nice, lgtm

review: Approve
lp:~alan-griffiths/mir/tidy-code updated on 2017-09-06
4241. By Alan Griffiths on 2017-09-06

Change default launcher for miral-app & miral-desktop to qtubuntu as it works better on artful.

Approved by Brandon Schaefer, mir-ci-bot.

4242. By Alan Griffiths on 2017-09-06

Remove workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258. (This was fixed in 4.9.4, 5.3 and 6.0, it no longer affects any platform we target.)
.

Approved by Brandon Schaefer, mir-ci-bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/display_server.cpp'
2--- src/server/display_server.cpp 2017-07-28 17:00:43 +0000
3+++ src/server/display_server.cpp 2017-09-06 11:17:34 +0000
4@@ -71,38 +71,31 @@
5 {
6 try
7 {
8- // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258
9- // After using rethrow_exception() (and catching the exception),
10- // all subsequent calls to uncaught_exception() return `true'.
11- bool really_unwinding = true;
12-
13 auto comm = try_but_revert_if_unwinding(
14 [this] { connector->stop(); },
15- [&, this] { if (really_unwinding) connector->start(); });
16+ [&, this] { connector->start(); });
17
18 auto prompt = try_but_revert_if_unwinding(
19 [this] { prompt_connector->stop(); },
20- [&, this] { if (really_unwinding) prompt_connector->start(); });
21+ [&, this] { prompt_connector->start(); });
22
23 auto dispatcher = try_but_revert_if_unwinding(
24 [this] { input_dispatcher->stop(); },
25- [&, this] { if (really_unwinding) input_dispatcher->start(); });
26+ [&, this] { input_dispatcher->start(); });
27
28 auto input = try_but_revert_if_unwinding(
29 [this] { input_manager->stop(); },
30- [&, this] { if (really_unwinding) input_manager->start(); });
31+ [&, this] { input_manager->start(); });
32
33 auto display_config_processing = try_but_revert_if_unwinding(
34 [this] { display_changer->pause_display_config_processing(); },
35- [&, this] { if (really_unwinding) display_changer->resume_display_config_processing(); });
36+ [&, this] { display_changer->resume_display_config_processing(); });
37
38 auto comp = try_but_revert_if_unwinding(
39 [this] { compositor->stop(); },
40- [&, this] { if (really_unwinding) compositor->start(); });
41+ [&, this] { compositor->start(); });
42
43 display->pause();
44-
45- really_unwinding = false;
46 }
47 catch(std::runtime_error const&)
48 {
49@@ -118,38 +111,31 @@
50 {
51 try
52 {
53- // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258
54- // After using rethrow_exception() (and catching the exception),
55- // all subsequent calls to uncaught_exception() return `true'.
56- bool really_unwinding = true;
57-
58 auto disp = try_but_revert_if_unwinding(
59 [this] { display->resume(); },
60- [&, this] { if (really_unwinding) display->pause(); });
61+ [&, this] { display->pause(); });
62
63 auto comp = try_but_revert_if_unwinding(
64 [this] { compositor->start(); },
65- [&, this] { if (really_unwinding) compositor->stop(); });
66+ [&, this] { compositor->stop(); });
67
68 auto display_config_processing = try_but_revert_if_unwinding(
69 [this] { display_changer->resume_display_config_processing(); },
70- [&, this] { if (really_unwinding) display_changer->pause_display_config_processing(); });
71+ [&, this] { display_changer->pause_display_config_processing(); });
72
73 auto input = try_but_revert_if_unwinding(
74 [this] { input_manager->start(); },
75- [&, this] { if (really_unwinding) input_manager->stop(); });
76+ [&, this] { input_manager->stop(); });
77
78 auto dispatcher = try_but_revert_if_unwinding(
79 [this] { input_dispatcher->start(); },
80- [&, this] { if (really_unwinding) input_dispatcher->stop(); });
81+ [&, this] { input_dispatcher->stop(); });
82
83 auto prompt = try_but_revert_if_unwinding(
84 [this] { prompt_connector->start(); },
85- [&, this] { if (really_unwinding) prompt_connector->stop(); });
86+ [&, this] { prompt_connector->stop(); });
87
88 connector->start();
89-
90- really_unwinding = false;
91 }
92 catch(std::runtime_error const&)
93 {

Subscribers

People subscribed via source and target branches