Merge lp:~gerboland/qtmir/allow-valgrind into lp:qtmir

[Gerry Boland]

Extend timeouts when running under valgrind

When QMirServer is starting up, it spawns a separate thread for Mir to startup and waits for it. As valgrind slows execution greatly, the QMirServer timeout triggers before Mir has started, causing the QMirServer to think it failed and exit.

This patch adds ability to detect when running under valgrind and extending timeouts to suit.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:610
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/528/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4232
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4260
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4095/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/528/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Are we giving up on following https://wiki.ubuntu.com/Process/Merges/Checklists/QtMir ?

[Daniel d'Andrada (dandrader)]

Couldn't reproduce the problem when running qml-demo-shell on my PC but that MP looks harmless enough.

review: Approve

[Albert Astals Cid (aacid)]

Text conflict in src/platforms/mirserver/qmirserver_p.cpp
1 conflicts encountered

Was already top approved.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

"""
timeout = RUNNING_ON_VALGRIND ? 10 : 100
"""

Now having a second look at it. Shouldn't be the other way around? Ie:

timeout = RUNNING_ON_VALGRIND ? 100 : 10

review: Needs Information

[Gerry Boland (gerboland)]

@dandrader - yes totally. Now I'm confused as I tested the bad code and it worked.. I'll retest to be sure

[Gerry Boland (gerboland)]

Ok, tested, works as expected now

[Daniel d'Andrada (dandrader)]

ok

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:620
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/597/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4568/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4596
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4422/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4422/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4422/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4422/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4422/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4422/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/597/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:620
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/600/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4600
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4427/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4427/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4427/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4427/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4427/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4427
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4427/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/600/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-08 19:53:50 +0000
+++ CMakeLists.txt	2017-03-14 13:49:50 +0000
@@ -93,6 +93,7 @@
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=26)
 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
+pkg_check_modules(VALGRIND valgrind REQUIRED)
 
 include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2017-03-07 23:41:44 +0000
+++ debian/control	2017-03-14 13:49:50 +0000
@@ -40,6 +40,7 @@
                qtdeclarative5-dev,
                qtdeclarative5-private-dev,
                quilt,
+               valgrind,
 # libmirserver-dev should have brought this dep. Bug lp:1617435
                uuid-dev,
 # mirtest pkgconfig requires these, but doesn't have a deb dependency. Bug lp:1633537

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2017-02-15 13:21:50 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2017-03-14 13:49:50 +0000
@@ -46,6 +46,8 @@
     ${APPLICATION_API_INCLUDE_DIRS}
 
     ${CONTENT_HUB_INCLUDE_DIRS}
+
+    ${VALGRIND_INCLUDE_DIRS}
 )
 
 # We have to remove -pedantic for tracepoints.c

=== modified file 'src/platforms/mirserver/qmirserver.cpp'
--- src/platforms/mirserver/qmirserver.cpp	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/qmirserver.cpp	2017-03-14 13:49:50 +0000
@@ -18,6 +18,8 @@
 #include <QObject>
 #include <QDebug>
 
+#include <valgrind.h>
+
 // local
 #include "qmirserver.h"
 #include "qmirserver_p.h"
@@ -58,7 +60,9 @@
 
     if (d->serverThread->isRunning()) {
         d->stop();
-        if (!d->serverThread->wait(10000)) {
+
+        const int timeout = RUNNING_ON_VALGRIND ? 100 : 10; // else timeout triggers before Mir done
+        if (!d->serverThread->wait(timeout * 1000)) {
             // do something to indicate fail during shutdown
             qCritical() << "ERROR: QMirServer - Mir failed to shut down correctly, terminating it";
             d->serverThread->terminate();

=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
--- src/platforms/mirserver/qmirserver_p.cpp	2017-02-21 18:53:48 +0000
+++ src/platforms/mirserver/qmirserver_p.cpp	2017-03-14 13:49:50 +0000
@@ -36,6 +36,8 @@
 #include <QCoreApplication>
 #include <QOpenGLContext>
 
+#include <valgrind.h>
+
 static int qtmirArgc{1};
 static const char *qtmirArgv[]{"qtmir"};
 
@@ -55,8 +57,10 @@
 
 bool MirServerThread::waitForMirStartup()
 {
+    const int timeout = RUNNING_ON_VALGRIND ? 100 : 10; // else timeout triggers before Mir ready
+
     std::unique_lock<decltype(mutex)> lock(mutex);
-    started_cv.wait_for(lock, std::chrono::seconds{10}, [&]{ return mir_running; });
+    started_cv.wait_for(lock, std::chrono::seconds{timeout}, [&]{ return mir_running; });
     return mir_running;
 }