Merge lp:~cjwatson/mir/stdint-include into lp:mir

[Colin Watson]

Include <stdint.h> for standard integer types.

This should fix the failure seen in https://launchpad.net/ubuntu/+source/mir/0.1.6+14.04.20140310-0ubuntu1/+build/5800637, by including <stdint.h> where the standard integer types (uint32_t, etc.) are used. src/server/report/lttng/lttng_utils.h already has this so the server works fine, but on the client side it currently depends on what happens to be included by other headers, which is going to be architecture-dependent to at least some extent.

[Alan Griffiths (alan-griffiths)]

Hmm. I was going to recommend including <cstdint> but existing practice isn't consistent anyway.

review: Approve

[Kevin DuBois (kdub)]

okay

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1479
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1082/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/835
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/814/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/819
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/836
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/836/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/778
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4864

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

I don't see how those CI problems could be caused by this, retriggering CI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1479
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1086/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1258
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/841/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/818
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/823
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/823/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/842
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/842/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/785/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4879

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

Good.

review: Approve

[Chris Halse Rogers (raof)]

Looks good to me. Let's see if CI has cleared up yet.

review: Approve

[Daniel van Vugt (vanvugt)]

Being C++, technically you're meant to:
    #include <cstdint>
to guarantee you get nice safe 'extern "C"' declarations. But the C-style usually still works.

review: Approve

[Colin Watson (cjwatson)]

I was just matching the existing uses in
src/server/report/lttng/scene_report_tp.h and
src/client/lttng/input_receiver_report_tp.h (and indeed various other
files). If you think I should change *all* the existing uses, then I
can add a revision to this branch that does that; but I'd rather not
make it inconsistent.

[Daniel van Vugt (vanvugt)]

No need to change other instances that are beyond the intended scope of the proposal. But a little inconsistency is OK if the newer instances are more correct.

[Colin Watson (cjwatson)]

OK, pushing a change to these instances.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1480
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1093/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1271/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/852/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/825/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/853/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Some headers need to be C compatible.

In file included from /mir/src/client/lttng/tracepoints.c:4:0:
/mir/src/client/lttng/rpc_report_tp.h:29:19: fatal error: cstdint: No such file or directory
 #include <cstdint>
                   ^
compilation terminated.

review: Needs Fixing

[Colin Watson (cjwatson)]

Hilarious. That's what I did until everyone told me to do otherwise.
I'll revert my last patch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1481
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/829
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/829/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/834
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/858
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/858/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/800
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4929

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Argh. Tripped up by the one reporting implementation in Mir that's C and not C++ :)

review: Approve

=== modified file 'src/client/lttng/input_receiver_report_tp.h'
--- src/client/lttng/input_receiver_report_tp.h	2014-02-03 11:44:32 +0000
+++ src/client/lttng/input_receiver_report_tp.h	2014-03-18 15:14:23 +0000
@@ -26,6 +26,7 @@
 #define MIR_CLIENT_LTTNG_INPUT_RECEIVER_REPORT_TP_H_
 
 #include <lttng/tracepoint.h>
+#include <stdint.h>
 
 #ifdef __clang__
 /*

=== modified file 'src/client/lttng/rpc_report_tp.h'
--- src/client/lttng/rpc_report_tp.h	2014-03-06 06:05:17 +0000
+++ src/client/lttng/rpc_report_tp.h	2014-03-18 15:14:23 +0000
@@ -26,6 +26,7 @@
 #define MIR_CLIENT_LTTNG_RPC_REPORT_TP_H_
 
 #include <lttng/tracepoint.h>
+#include <stdint.h>
 
 #ifdef __clang__
 /*