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
71
    {
71
    {
6
72
        try
72
        try
7
73
        {
73
        {
8
74
            // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258
9
75
            // After using rethrow_exception() (and catching the exception),
10
76
            // all subsequent calls to uncaught_exception() return `true'.
11
77
            bool really_unwinding = true;
12
78
            
13
79
            auto comm = try_but_revert_if_unwinding(
74
            auto comm = try_but_revert_if_unwinding(
14
80
                [this] { connector->stop(); },
75
                [this] { connector->stop(); },
16
81
                [&, this] { if (really_unwinding) connector->start(); });
76
                [&, this] { connector->start(); });
17
82
77
18
83
            auto prompt = try_but_revert_if_unwinding(
78
            auto prompt = try_but_revert_if_unwinding(
19
84
                [this] { prompt_connector->stop(); },
79
                [this] { prompt_connector->stop(); },
21
85
                [&, this] { if (really_unwinding) prompt_connector->start(); });
80
                [&, this] { prompt_connector->start(); });
22
86
81
23
87
            auto dispatcher = try_but_revert_if_unwinding(
82
            auto dispatcher = try_but_revert_if_unwinding(
24
88
                [this] { input_dispatcher->stop(); },
83
                [this] { input_dispatcher->stop(); },
26
89
                [&, this] { if (really_unwinding) input_dispatcher->start(); });
84
                [&, this] { input_dispatcher->start(); });
27
90
85
28
91
            auto input = try_but_revert_if_unwinding(
86
            auto input = try_but_revert_if_unwinding(
29
92
                [this] { input_manager->stop(); },
87
                [this] { input_manager->stop(); },
31
93
                [&, this] { if (really_unwinding) input_manager->start(); });
88
                [&, this] { input_manager->start(); });
32
94
89
33
95
            auto display_config_processing = try_but_revert_if_unwinding(
90
            auto display_config_processing = try_but_revert_if_unwinding(
34
96
                [this] { display_changer->pause_display_config_processing(); },
91
                [this] { display_changer->pause_display_config_processing(); },
36
97
                [&, this] { if (really_unwinding) display_changer->resume_display_config_processing(); });
92
                [&, this] { display_changer->resume_display_config_processing(); });
37
98
93
38
99
            auto comp = try_but_revert_if_unwinding(
94
            auto comp = try_but_revert_if_unwinding(
39
100
                [this] { compositor->stop(); },
95
                [this] { compositor->stop(); },
41
101
                [&, this] { if (really_unwinding) compositor->start(); });
96
                [&, this] { compositor->start(); });
42
102
97
43
103
            display->pause();
98
            display->pause();
44
104
45
105
            really_unwinding = false;
46
106
        }
99
        }
47
107
        catch(std::runtime_error const&)
100
        catch(std::runtime_error const&)
48
108
        {
101
        {
49
@@ -118,38 +111,31 @@
50
118
    {
111
    {
51
119
        try
112
        try
52
120
        {
113
        {
53
121
            // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258
54
122
            // After using rethrow_exception() (and catching the exception),
55
123
            // all subsequent calls to uncaught_exception() return `true'.
56
124
            bool really_unwinding = true;
57
125
58
126
            auto disp = try_but_revert_if_unwinding(
114
            auto disp = try_but_revert_if_unwinding(
59
127
                [this] { display->resume(); },
115
                [this] { display->resume(); },
61
128
                [&, this] { if (really_unwinding) display->pause(); });
116
                [&, this] { display->pause(); });
62
129
117
63
130
            auto comp = try_but_revert_if_unwinding(
118
            auto comp = try_but_revert_if_unwinding(
64
131
                [this] { compositor->start(); },
119
                [this] { compositor->start(); },
66
132
                [&, this] { if (really_unwinding) compositor->stop(); });
120
                [&, this] { compositor->stop(); });
67
133
121
68
134
            auto display_config_processing = try_but_revert_if_unwinding(
122
            auto display_config_processing = try_but_revert_if_unwinding(
69
135
                [this] { display_changer->resume_display_config_processing(); },
123
                [this] { display_changer->resume_display_config_processing(); },
71
136
                [&, this] { if (really_unwinding) display_changer->pause_display_config_processing(); });
124
                [&, this] { display_changer->pause_display_config_processing(); });
72
137
125
73
138
            auto input = try_but_revert_if_unwinding(
126
            auto input = try_but_revert_if_unwinding(
74
139
                [this] { input_manager->start(); },
127
                [this] { input_manager->start(); },
76
140
                [&, this] { if (really_unwinding) input_manager->stop(); });
128
                [&, this] { input_manager->stop(); });
77
141
129
78
142
            auto dispatcher = try_but_revert_if_unwinding(
130
            auto dispatcher = try_but_revert_if_unwinding(
79
143
                [this] { input_dispatcher->start(); },
131
                [this] { input_dispatcher->start(); },
81
144
                [&, this] { if (really_unwinding) input_dispatcher->stop(); });
132
                [&, this] { input_dispatcher->stop(); });
82
145
133
83
146
            auto prompt = try_but_revert_if_unwinding(
134
            auto prompt = try_but_revert_if_unwinding(
84
147
                [this] { prompt_connector->start(); },
135
                [this] { prompt_connector->start(); },
86
148
                [&, this] { if (really_unwinding) prompt_connector->stop(); });
136
                [&, this] { prompt_connector->stop(); });
87
149
137
88
150
            connector->start();
138
            connector->start();
89
151
            
90
152
            really_unwinding = false;
91
153
        }
139
        }
92
154
        catch(std::runtime_error const&)
140
        catch(std::runtime_error const&)
93
155
        {
141
        {
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
Related bugs:	Link a bug report
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