Merge lp:~vanvugt/mir/fix-mirvanity-sample-zero into lp:mir

[Daniel van Vugt]

mirvanity: Avoid recording a spuriously low first sample due to thread
start-up races.

Although such a glitch would resolve itself and vanish at 50% test
completion, it's better to never see it at all because people will get
confused.

With this change the first sample recorded is much more likely to be
accurate and no longer an outlier that skews the results.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3652
https://mir-jenkins.ubuntu.com/job/mir-ci/1465/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1812
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1866
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1857
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1857
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1857
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1836/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1836
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1836/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

ok

review: Approve

=== modified file 'src/utils/vanity.c'
--- src/utils/vanity.c	2016-04-05 10:17:15 +0000
+++ src/utils/vanity.c	2016-08-16 08:06:30 +0000
@@ -463,6 +463,7 @@
             state->expected_direction = 0;
 
             if (latency < 10*one_second &&
+                (nhistory || latency > 10*one_millisecond) &&
                 frame_time &&
                 state->display_frame_time)
             {