Merge lp:~marcustomlinson/unity-scopes-shell/lp-1567429 into lp:unity-scopes-shell

[Marcus Tomlinson]

Update child scopes in a background thread to greatly improve the performance of Scope::settings()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/127
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/90/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/433/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/434/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/128
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/91/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/434/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good, I think it will improve the perceived performance of Settings page quite a bit already. I yet need to check the silo and how it impacts search.

I think there is one other potential improvement we could make though: make the call to m_scopeProxy->child_scopes() non-blocking. I think currently since it blocks the main thread we may see the loading bar animation struggling during search. What do you think about starting the call in a separate thread and *only* waiting for the call to finish when the settings are actually accessed/needed (e.g. in call to data() if there is no better place)?

review: Needs Information

[Marcus Tomlinson (marcustomlinson)]

> Looks good, I think it will improve the perceived performance of Settings page
> quite a bit already. I yet need to check the silo and how it impacts search.
>
> I think there is one other potential improvement we could make though: make
> the call to m_scopeProxy->child_scopes() non-blocking. I think currently since
> it blocks the main thread we may see the loading bar animation struggling
> during search. What do you think about starting the call in a separate thread
> and *only* waiting for the call to finish when the settings are actually
> accessed/needed (e.g. in call to data() if there is no better place)?

Good point. Ok I've moved the child scopes update to a background thread, expected to complete upon a call to settings()

[Paweł Stołowski (stolowski)]

Thanks, great stuff with QFuture! This looks very good, but I think with these changes we need to address the following now:

- m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata()) is now called from a new thread, so m_settingsModel needs to synchronize access to its members. We may have a situation where Settings page is already opened by the UI and registry change triggers the update of child scopes at the same time.
- the destructor of Scope needs to wait for m_childScopesFuture, possibly with cancel() first (according to QFuture docs, the destructor of QFuture doesn't wait for it to finish). Alternatively use QFutureSynchronizer.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:305
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/435/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/129
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/92/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/435/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> Thanks, great stuff with QFuture! This looks very good, but I think with these
> changes we need to address the following now:
>
> - m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata()) is
> now called from a new thread, so m_settingsModel needs to synchronize access
> to its members. We may have a situation where Settings page is already opened
> by the UI and registry change triggers the update of child scopes at the same
> time.
> - the destructor of Scope needs to wait for m_childScopesFuture, possibly with
> cancel() first (according to QFuture docs, the destructor of QFuture doesn't
> wait for it to finish). Alternatively use QFutureSynchronizer.

Very true. k, done.

[Paweł Stołowski (stolowski)]

Ok, looks good now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/436/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/130
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/130
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/93/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/436/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/437/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/131
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/94/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/437/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

http://paste.ubuntu.com/15789165/ has the outcome of this branch, an improvement for sure.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/438/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/132
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/95/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/438/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

New patch brigns down the thing to 0msec now, seems much nicer and can't see it regressing in any obvious way

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/439/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/133
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/133
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/96/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/439/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/453/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/147
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/110/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/453/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-shell/lp-1567429]

313. By Marcus Tomlinson on 2016-04-19

Remove unnecessary sync() call

314. By Marcus Tomlinson on 2016-04-19

Don't emit settingsChanged() unless settings actually change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/148
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/111/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/111/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/111/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/454/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-shell/lp-1567429]

315. By Marcus Tomlinson on 2016-04-19

Emit settingsChanged when child scope state changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/455/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/149
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/112/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/455/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good!

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2016-03-17 22:35:44 +0000
+++ src/Unity/scope.cpp	2016-04-19 08:05:18 +0000
@@ -91,6 +91,7 @@
     , m_hasNavigation(false)
     , m_favorite(false)
     , m_initialQueryDone(false)
+    , m_childScopesDirty(true)
     , m_searchController(new CollectionController)
     , m_activationController(new CollectionController)
     , m_status(Status::Okay)
@@ -125,6 +126,7 @@
 
 Scope::~Scope()
 {
+    m_childScopesFuture.waitForFinished();
 }
 
 void Scope::processSearchChunk(PushEvent* pushEvent)
@@ -247,6 +249,7 @@
 {
     // refresh Settings view if needed
     if (require_child_scopes_refresh()) {
+        m_childScopesDirty = true;
         update_child_scopes();
     }
 
@@ -721,6 +724,10 @@
 
     setSearchInProgress(true);
 
+    // If applicable, update this scope's child scopes now, as part of the search process
+    // (i.e. while the loading bar is visible).
+    update_child_scopes();
+
     if (m_proxy) {
         scopes::SearchMetadata meta(QLocale::system().name().toStdString(), m_formFactor.toStdString());
         auto const userAgent = m_scopesInstance->userAgentString();
@@ -888,10 +895,6 @@
 
 unity::shell::scopes::SettingsModelInterface* Scope::settings() const
 {
-    if (m_settingsModel && m_scopesInstance)
-    {
-        m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata());
-    }
     return m_settingsModel.data();
 }
 
@@ -906,9 +909,20 @@
 
 void Scope::update_child_scopes()
 {
-    if (m_settingsModel && m_scopesInstance)
+    // only run the update if child scopes have changed
+    if (m_childScopesDirty && m_settingsModel && m_scopesInstance)
     {
-        m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata());
+        // reset the flag so that re-entering this method won't restart the update unnecessarily
+        m_childScopesDirty = false;
+
+        // just in case we have another update still running, wait here for it to complete
+        m_childScopesFuture.waitForFinished();
+
+        // run the update in a seperate thread
+        m_childScopesFuture = QtConcurrent::run([this]
+        {
+            m_settingsModel->update_child_scopes(m_scopesInstance->getAllMetadata());
+        });
     }
 }
 
@@ -1258,6 +1272,11 @@
     m_activationController->invalidate();
 }
 
+void Scope::invalidateChildScopes()
+{
+    m_childScopesDirty = true;
+}
+
 void Scope::invalidateResults()
 {
     if (m_isActive) {

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2016-03-07 08:29:14 +0000
+++ src/Unity/scope.h	2016-04-19 08:05:18 +0000
@@ -21,6 +21,7 @@
 #define NG_SCOPE_H
 
 // Qt
+#include <QFuture>
 #include <QObject>
 #include <QString>
 #include <QTimer>
@@ -180,6 +181,7 @@
     void setSearchQueryString(const QString& search_query);
 
 public Q_SLOTS:
+    void invalidateChildScopes();
     void invalidateResults();
     virtual void dispatchSearch();
     void setSearchInProgress(bool searchInProgress);
@@ -248,6 +250,9 @@
     bool m_favorite;
     bool m_initialQueryDone;
 
+    bool m_childScopesDirty;
+    QFuture<void> m_childScopesFuture;
+
     QMap<std::string, QList<std::shared_ptr<unity::scopes::CategorisedResult>>> m_category_results;
     std::unique_ptr<CollectionController> m_searchController;
     std::unique_ptr<CollectionController> m_activationController;

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2016-02-04 11:43:34 +0000
+++ src/Unity/scopes.cpp	2016-04-19 08:05:18 +0000
@@ -550,10 +550,12 @@
     qDebug() << "Refreshing scope metadata";
     refreshScopeMetadata();
     Q_FOREACH(Scope::Ptr scope, m_scopes) {
+        scope->invalidateChildScopes();
         scope->invalidateResults();
     }
 
     Q_FOREACH(Scope::Ptr scope, m_tempScopes) {
+        scope->invalidateChildScopes();
         scope->invalidateResults();
     }
 }

=== modified file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	2016-03-30 12:34:12 +0000
+++ src/Unity/settingsmodel.cpp	2016-04-19 08:05:18 +0000
@@ -152,6 +152,8 @@
 
 QVariant SettingsModel::data(const QModelIndex& index, int role) const
 {
+    QMutexLocker locker(&m_mutex);
+
     int row = index.row();
     QVariant result;
 
@@ -247,6 +249,8 @@
 
 QVariant SettingsModel::value(const QString& id) const
 {
+    QMutexLocker locker(&m_mutex);
+
     // Check for the setting id in the child scopes list first, in case the
     // aggregator is incorrectly using a scope id as a settings as well.
     if (m_child_scopes_data_by_id.contains(id))
@@ -303,6 +307,8 @@
 
 void SettingsModel::update_child_scopes(QMap<QString, sc::ScopeMetadata::SPtr> const& scopes_metadata)
 {
+    QMutexLocker locker(&m_mutex);
+
     if (!scopes_metadata.contains(m_scopeId) ||
         !scopes_metadata[m_scopeId]->is_aggregator())
     {
@@ -346,15 +352,6 @@
         }
         QString displayName = QString::fromStdString(_("Display results from %1")).arg(QString(scopes_metadata[id]->display_name().c_str()));
 
-        QSharedPointer<QTimer> timer(new QTimer());
-        timer->setProperty("setting_id", id);
-        timer->setSingleShot(true);
-        timer->setInterval(m_settingsTimeout);
-        timer->setTimerType(Qt::VeryCoarseTimer);
-        connect(timer.data(), SIGNAL(timeout()), this,
-                SLOT(settings_timeout()));
-        m_child_scopes_timers[id] = timer;
-
         QSharedPointer<Data> setting(
                 new Data(id, displayName, QStringLiteral("boolean"), QVariantMap(), QVariant(), QVariant::Bool));
 
@@ -364,13 +361,17 @@
 
     if (reset) {
         endResetModel();
-        Q_EMIT countChanged();
     }
+
+    locker.unlock();
+    Q_EMIT countChanged();
 }
 
 bool SettingsModel::setData(const QModelIndex &index, const QVariant &value,
         int role)
 {
+    QMutexLocker locker(&m_mutex);
+
     int row = index.row();
     QVariant result;
 
@@ -400,6 +401,18 @@
         {
             case Roles::RoleValue:
             {
+                if (!m_child_scopes_timers.contains(data->id))
+                {
+                    QSharedPointer<QTimer> timer(new QTimer());
+                    timer->setProperty("setting_id", data->id);
+                    timer->setSingleShot(true);
+                    timer->setInterval(m_settingsTimeout);
+                    timer->setTimerType(Qt::VeryCoarseTimer);
+                    connect(timer.data(), SIGNAL(timeout()), this,
+                            SLOT(settings_timeout()));
+                    m_child_scopes_timers[data->id] = timer;
+                }
+
                 QSharedPointer<QTimer> timer = m_child_scopes_timers[data->id];
                 timer->setProperty("index", row - m_data.size());
                 timer->setProperty("value", value);
@@ -422,16 +435,20 @@
 
 int SettingsModel::count() const
 {
+    QMutexLocker locker(&m_mutex);
     return m_data.size() + m_child_scopes_data.size();
 }
 
 bool SettingsModel::require_child_scopes_refresh() const
 {
+    QMutexLocker locker(&m_mutex);
     return m_requireChildScopesRefresh;
 }
 
 void SettingsModel::settings_timeout()
 {
+    QMutexLocker locker(&m_mutex);
+
     QObject *timer = sender();
     if (!timer)
     {
@@ -454,6 +471,9 @@
             try
             {
                 m_scopeProxy->set_child_scopes(m_child_scopes);
+
+                locker.unlock();
+                Q_EMIT settingsChanged();
             }
             catch (std::exception const& e)
             {
@@ -488,6 +508,7 @@
             FileLock lock = unixLock(m_settings_path, true);
             m_settings->sync(); // make sure the change to setting value is synced to fs
 
+            locker.unlock();
             Q_EMIT settingsChanged();
         }
         catch(const unity::FileException& e)

=== modified file 'src/Unity/settingsmodel.h'
--- src/Unity/settingsmodel.h	2016-03-30 12:34:12 +0000
+++ src/Unity/settingsmodel.h	2016-04-19 08:05:18 +0000
@@ -29,6 +29,7 @@
 
 #include <QAbstractListModel>
 #include <QList>
+#include <QMutex>
 #include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
@@ -93,6 +94,7 @@
     void tryLoadSettings() const;
 
 protected:
+    mutable QMutex m_mutex;
     QString m_scopeId;
     unity::scopes::ScopeProxy m_scopeProxy;
     int m_settingsTimeout;