Merge lp:~fboucault/unity8/window_state_storage_max_thread_fix into lp:unity8

[Florian Boucault]

WindowStateStorage: use a private QThreadPool to ensure that WindowStateStorage::saveValue always has a thread available to execute the query in.

WindowStateStorage: use a private QThreadPool to ensure that WindowStateStorage::saveValue always has a thread available to execute the query in.

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

FAILED: Continuous integration, rev:2869
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3504/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4632/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4660
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4487/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4487/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4487/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4487/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4487/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4487
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4487/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2869
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3516/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4650
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4678
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4503/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4503/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4503/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4503/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4503/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4503
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4503/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

* Did you perform an exploratory manual test run of the code change and any related functionality?

yes

* Did CI run pass? If not, please explain why.

yes

review: Approve

=== modified file 'plugins/Utils/windowstatestorage.cpp'
--- plugins/Utils/windowstatestorage.cpp	2017-01-03 16:56:39 +0000
+++ plugins/Utils/windowstatestorage.cpp	2017-03-23 14:23:28 +0000
@@ -165,7 +165,7 @@
 {
     QMutexLocker mutexLocker(&s_mutex);
 
-    QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
+    QFuture<void> future = QtConcurrent::run(&m_threadPool, executeAsyncQuery, queryString);
     m_asyncQueries.append(future);
 
     QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

=== modified file 'plugins/Utils/windowstatestorage.h'
--- plugins/Utils/windowstatestorage.h	2017-01-16 10:49:11 +0000
+++ plugins/Utils/windowstatestorage.h	2017-03-23 14:23:28 +0000
@@ -18,6 +18,7 @@
 #include <QSqlDatabase>
 #include <QMutex>
 #include <QFuture>
+#include <QThreadPool>
 
 // unity-api
 #include <unity/shell/application/Mir.h>
@@ -72,4 +73,5 @@
     QSqlDatabase m_db;
 
     QList<QFuture<void>> m_asyncQueries;
+    QThreadPool m_threadPool;
 };