Mir

Merge lp:~raof/mir/remove-old-clang-workaround into lp:mir

  1. remove-old-clang-workaround
  2. Merge into development-branch
Proposed by Chris Halse Rogers
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1895
Proposed branch: lp:~raof/mir/remove-old-clang-workaround
Merge into: lp:mir
Diff against target: 235 lines (+0/-92)
12 files modified
include.private/common/mir/report/lttng/mir_tracepoint.h (+0/-17)
src/client/lttng/input_receiver_report_tp.h (+0/-14)
src/client/lttng/rpc_report_tp.h (+0/-14)
src/server/report/lttng/compositor_report_tp.h (+0/-2)
src/server/report/lttng/connector_report_tp.h (+0/-2)
src/server/report/lttng/display_report_tp.h (+0/-2)
src/server/report/lttng/input_report_tp.h (+0/-2)
src/server/report/lttng/lttng_utils.h (+0/-11)
src/server/report/lttng/lttng_utils_pop.h (+0/-22)
src/server/report/lttng/message_processor_report_tp.h (+0/-2)
src/server/report/lttng/scene_report_tp.h (+0/-2)
src/server/report/lttng/session_mediator_report_tp.h (+0/-2)
To merge this branch: bzr merge lp:~raof/mir/remove-old-clang-workaround
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alberto Aguirre (community) Approve
Daniel van Vugt Approve
Review via email: mp+233448@code.launchpad.net

Commit message

Remove an obsolete workaround for a clang bug with the lttng headers.
Fixes LP: #1348472.

Description of the change

Remove some obsolete workarounds for a clang bug.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1893
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~raof/mir/remove-old-clang-workaround/+merge/233448/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2620/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1142
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/535
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2660
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12711

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2620/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Seems to work.

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

FAILED: Continuous integration, rev:1893
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2627/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1629
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1605/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1149
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/542
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/542/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2667/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12732

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2627/rebuild

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

Ok.

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

PASSED: Continuous integration, rev:1893
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2639/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1161
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/558
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2678
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12838

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2639/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include.private/common/mir/report/lttng/mir_tracepoint.h'
2--- include.private/common/mir/report/lttng/mir_tracepoint.h 2014-08-29 08:38:44 +0000
3+++ include.private/common/mir/report/lttng/mir_tracepoint.h 2014-09-05 02:13:21 +0000
4@@ -19,23 +19,6 @@
5 #ifndef MIR_LTTNG_MIR_TRACEPOINT_H_
6 #define MIR_LTTNG_MIR_TRACEPOINT_H_
7
8-/*
9- * The STAP_PROBEV() macro from sdt.h (SystemTap) used by
10- * the tracepoint() macro from lttng/tracepoint.h fails to
11- * build with clang at the moment. Disable tracepoints
12- * when building with clang until this is resolved.
13- *
14- * See: http://sourceware.org/bugzilla/show_bug.cgi?id=13974
15- */
16-#ifdef __clang__
17-namespace mir_systemtap_bug_13974
18-{
19-inline void mir_tracepoint_consume_args(int, ...) {}
20-}
21-#define mir_tracepoint(c, e, ...) ::mir_systemtap_bug_13974::mir_tracepoint_consume_args(0, __VA_ARGS__)
22-#pragma message "Building with clang: Disabling LTTng tracepoints."
23-#else
24 #define mir_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)
25-#endif
26
27 #endif /* MIR_LTTNG_MIR_TRACEPOINT_H_ */
28
29=== modified file 'src/client/lttng/input_receiver_report_tp.h'
30--- src/client/lttng/input_receiver_report_tp.h 2014-03-26 05:48:59 +0000
31+++ src/client/lttng/input_receiver_report_tp.h 2014-09-05 02:13:21 +0000
32@@ -28,16 +28,6 @@
33 #include <lttng/tracepoint.h>
34 #include <stdint.h>
35
36-#ifdef __clang__
37-/*
38- * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
39- * these functions are unused and so generate fatal warnings.
40- * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
41- */
42-#pragma clang diagnostic push
43-#pragma clang diagnostic warning "-Wunused-function"
44-#endif
45-
46 TRACEPOINT_EVENT(
47 mir_client_input_receiver,
48 key_event,
49@@ -88,10 +78,6 @@
50 )
51 )
52
53-#ifdef __clang__
54-#pragma clang diagnostic pop
55-#endif
56-
57 #endif /* MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_ */
58
59 #include <lttng/tracepoint-event.h>
60
61=== modified file 'src/client/lttng/rpc_report_tp.h'
62--- src/client/lttng/rpc_report_tp.h 2014-03-26 05:48:59 +0000
63+++ src/client/lttng/rpc_report_tp.h 2014-09-05 02:13:21 +0000
64@@ -28,16 +28,6 @@
65 #include <lttng/tracepoint.h>
66 #include <stdint.h>
67
68-#ifdef __clang__
69-/*
70- * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
71- * these functions are unused and so generate fatal warnings.
72- * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
73- */
74-#pragma clang diagnostic push
75-#pragma clang diagnostic warning "-Wunused-function"
76-#endif
77-
78 TRACEPOINT_EVENT(
79 mir_client_rpc,
80 invocation_requested,
81@@ -94,10 +84,6 @@
82 )
83 )
84
85-#ifdef __clang__
86-#pragma clang diagnostic pop
87-#endif
88-
89 #endif /* MIR_CLIENT_LTTNG_RPC_REPORT_TP_H_ */
90
91 #include <lttng/tracepoint-event.h>
92
93=== modified file 'src/server/report/lttng/compositor_report_tp.h'
94--- src/server/report/lttng/compositor_report_tp.h 2014-02-03 11:44:32 +0000
95+++ src/server/report/lttng/compositor_report_tp.h 2014-09-05 02:13:21 +0000
96@@ -69,8 +69,6 @@
97 )
98 )
99
100-#include "lttng_utils_pop.h"
101-
102 #endif /* MIR_LTTNG_COMPOSITOR_REPORT_TP_H_ */
103
104 #include <lttng/tracepoint-event.h>
105
106=== modified file 'src/server/report/lttng/connector_report_tp.h'
107--- src/server/report/lttng/connector_report_tp.h 2014-02-03 11:44:32 +0000
108+++ src/server/report/lttng/connector_report_tp.h 2014-09-05 02:13:21 +0000
109@@ -61,8 +61,6 @@
110 TP_ARGS(char const*, diagnostics),
111 TP_FIELDS(ctf_string(diagnostics, diagnostics)))
112
113-#include "lttng_utils_pop.h"
114-
115 #endif /* MIR_LTTNG_CONNECTOR_REPORT_TP_H_ */
116
117 #include <lttng/tracepoint-event.h>
118
119=== modified file 'src/server/report/lttng/display_report_tp.h'
120--- src/server/report/lttng/display_report_tp.h 2014-02-03 11:44:32 +0000
121+++ src/server/report/lttng/display_report_tp.h 2014-09-05 02:13:21 +0000
122@@ -62,8 +62,6 @@
123 )
124 )
125
126-#include "lttng_utils_pop.h"
127-
128 #endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
129
130 #include <lttng/tracepoint-event.h>
131
132=== modified file 'src/server/report/lttng/input_report_tp.h'
133--- src/server/report/lttng/input_report_tp.h 2014-03-06 06:05:17 +0000
134+++ src/server/report/lttng/input_report_tp.h 2014-09-05 02:13:21 +0000
135@@ -71,8 +71,6 @@
136 )
137 )
138
139-#include "lttng_utils_pop.h"
140-
141 #endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
142
143 #include <lttng/tracepoint-event.h>
144
145=== modified file 'src/server/report/lttng/lttng_utils.h'
146--- src/server/report/lttng/lttng_utils.h 2014-02-09 16:18:16 +0000
147+++ src/server/report/lttng/lttng_utils.h 2014-09-05 02:13:21 +0000
148@@ -19,16 +19,6 @@
149 #include <lttng/tracepoint.h>
150 #include <stdint.h>
151
152-#ifdef __clang__
153-/*
154- * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
155- * these functions are unused and so generate fatal warnings.
156- * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
157- */
158-#pragma clang diagnostic push
159-#pragma clang diagnostic warning "-Wunused-function"
160-#endif
161-
162 #ifndef _MIR_LTTNG_UTILS_H_
163 #define _MIR_LTTNG_UTILS_H_
164
165@@ -44,4 +34,3 @@
166 TRACEPOINT_EVENT_INSTANCE(comp, dummy_event, name, TP_ARGS(int,empty))
167
168 #endif
169-
170
171=== removed file 'src/server/report/lttng/lttng_utils_pop.h'
172--- src/server/report/lttng/lttng_utils_pop.h 2014-02-03 11:44:32 +0000
173+++ src/server/report/lttng/lttng_utils_pop.h 1970-01-01 00:00:00 +0000
174@@ -1,22 +0,0 @@
175-/*
176- * Copyright © 2014 Canonical Ltd.
177- *
178- * This program is free software: you can redistribute it and/or modify it
179- * under the terms of the GNU General Public License version 3,
180- * as published by the Free Software Foundation.
181- *
182- * This program is distributed in the hope that it will be useful,
183- * but WITHOUT ANY WARRANTY; without even the implied warranty of
184- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
185- * GNU General Public License for more details.
186- *
187- * You should have received a copy of the GNU General Public License
188- * along with this program. If not, see <http://www.gnu.org/licenses/>.
189- *
190- * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
191- */
192-
193-#ifdef __clang__
194-#pragma clang diagnostic pop
195-#endif
196-
197
198=== modified file 'src/server/report/lttng/message_processor_report_tp.h'
199--- src/server/report/lttng/message_processor_report_tp.h 2014-03-06 06:05:17 +0000
200+++ src/server/report/lttng/message_processor_report_tp.h 2014-09-05 02:13:21 +0000
201@@ -97,8 +97,6 @@
202 )
203 )
204
205-#include "lttng_utils_pop.h"
206-
207 #endif /* MIR_LTTNG_MESSAGE_PROCESSOR_REPORT_TP_H_ */
208
209 #include <lttng/tracepoint-event.h>
210
211=== modified file 'src/server/report/lttng/scene_report_tp.h'
212--- src/server/report/lttng/scene_report_tp.h 2014-02-03 11:44:32 +0000
213+++ src/server/report/lttng/scene_report_tp.h 2014-09-05 02:13:21 +0000
214@@ -52,8 +52,6 @@
215 TP_ARGS(char const*, name),
216 TP_FIELDS(ctf_string(name, name)))
217
218-#include "lttng_utils_pop.h"
219-
220 #endif /* MIR_LTTNG_SCENE_REPORT_TP_H_ */
221
222 #include <lttng/tracepoint-event.h>
223
224=== modified file 'src/server/report/lttng/session_mediator_report_tp.h'
225--- src/server/report/lttng/session_mediator_report_tp.h 2014-09-01 03:31:32 +0000
226+++ src/server/report/lttng/session_mediator_report_tp.h 2014-09-05 02:13:21 +0000
227@@ -73,8 +73,6 @@
228
229 #undef MIR_SESSION_MEDIATOR_EVENT
230
231-#include "lttng_utils_pop.h"
232-
233 #endif /* MIR_LTTNG_SESSION_MEDIATOR_REPORT_TP_H_ */
234
235 #include <lttng/tracepoint-event.h>

Subscribers

People subscribed via source and target branches