Merge lp:~jonas-drange/ubuntu-system-settings/lp1492260 into lp:ubuntu-system-settings

[Jonas G. Drange]

[time-date] Migrate threaded code to worker-object pattern, move sorting to a worker thread from the GUI thread, and only instantiate UbuntuTimeDatePanel plugin once.

NOTE: When you select a city/timezone, exit the panel and then re-enter it; there's a bug where it looks like more than one timezone is selected. This was not introduced by this branch and has been filed here, bug 1494860.

* Sorting of tz list ran in the main thread (this was the main contributor to the ui blockage). Sorting now happens in a separate thread.
* We're no longer sublassing QThread per recommendation from QT, instead we use a worker-object pattern.
* The UbuntuTimeDatePanel plugin was instantiated twice which, so the timezone map build was run twice. The plugin is now transferred from PageComponent to ChooseTimeZone via pagestack.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1521
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2386/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/570
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4080
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4080/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23173

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2386/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1522
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2392/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/576
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4126
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23247

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2392/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1525
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2393/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/577
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4128
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23252

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2393/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2394/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/578
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23259

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2394/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

The TZ failure in the last run was real, but should be fixed in r1534. A new CI run has started.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1534
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2395/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/579
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23267

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2395/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Excellent work, looks good and works well!

review: Approve

=== modified file 'plugins/time-date/ChooseTimeZone.qml'
--- plugins/time-date/ChooseTimeZone.qml	2014-06-11 13:05:23 +0000
+++ plugins/time-date/ChooseTimeZone.qml	2015-09-11 14:56:13 +0000
@@ -27,13 +27,15 @@
 ItemPage {
     title: i18n.tr("Time zone")
 
+    property UbuntuTimeDatePanel timeDatePanel
+
     Timer {
         id: goBackTimer
         onTriggered: pageStack.pop()
     }
 
-    UbuntuTimeDatePanel {
-        id: timeDatePanel
+    Connections {
+        target: timeDatePanel
         onTimeZoneChanged: {
             // Protect against the tz being changed externally
             if (locationsListView.manuallySelected !== "")

=== modified file 'plugins/time-date/PageComponent.qml'
--- plugins/time-date/PageComponent.qml	2015-08-04 18:14:04 +0000
+++ plugins/time-date/PageComponent.qml	2015-09-11 14:56:13 +0000
@@ -69,7 +69,9 @@
                 text: timeDatePanel.timeZone.replace("_", " ")
                 value: getUTCOffset()
                 progression: true
-                onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), {
+                    timeDatePanel: timeDatePanel
+                })
             }
 
             SettingsItemTitle {

=== modified file 'plugins/time-date/timezonelocationmodel.cpp'
--- plugins/time-date/timezonelocationmodel.cpp	2015-05-12 12:10:57 +0000
+++ plugins/time-date/timezonelocationmodel.cpp	2015-09-11 14:56:13 +0000
@@ -29,36 +29,40 @@
     QAbstractTableModel(parent),
     modelUpdating(true),
     m_pattern(),
-    m_workerThread(new TimeZonePopulateWorker()),
+    m_workerThread(new QThread()),
+    m_populateWorker(new TimeZonePopulateWorker()),
     m_watcher()
 {
     qRegisterMetaType<TzLocation>();
+    qRegisterMetaType<QList<TimeZoneLocationModel::TzLocation> >();
 
     QObject::connect(m_workerThread,
+            SIGNAL(started()),
+            m_populateWorker,
+            SLOT(run()));
+    QObject::connect(m_populateWorker,
             &TimeZonePopulateWorker::resultReady,
             this,
-            &TimeZoneLocationModel::processModelResult);
-    QObject::connect(m_workerThread,
-            &TimeZonePopulateWorker::finished,
-            this,
             &TimeZoneLocationModel::store);
     QObject::connect(m_workerThread,
-            &TimeZonePopulateWorker::finished,
+            SIGNAL(finished()),
             m_workerThread,
-            &QObject::deleteLater);
-    QObject::connect(m_workerThread,
-            &TimeZonePopulateWorker::finished,
-            this,
-            &TimeZoneLocationModel::modelUpdated);
+            SLOT(deleteLater()));
+    QObject::connect(m_populateWorker,
+            SIGNAL(finished()),
+            m_populateWorker,
+            SLOT(deleteLater()));
 
-    m_workerThread->start();
+    m_populateWorker->moveToThread(m_workerThread);
+    m_workerThread->start(QThread::IdlePriority);
 }
 
-void TimeZoneLocationModel::store()
+void TimeZoneLocationModel::store(QList<TzLocation> sortedLocations)
 {
+    m_originalLocations = sortedLocations;
     m_workerThread = nullptr;
     modelUpdating = false;
-    qSort(m_originalLocations.begin(), m_originalLocations.end());
+
     QObject::connect(&m_watcher,
                      &QFutureWatcher<TzLocation>::finished,
                      this,
@@ -68,11 +72,6 @@
         filter(m_pattern);
 }
 
-void TimeZoneLocationModel::processModelResult(TzLocation location)
-{
-    m_originalLocations.append(location);
-}
-
 void TimeZoneLocationModel::setModel(QList<TzLocation> locations)
 {
     beginResetModel();
@@ -190,10 +189,12 @@
 void TimeZonePopulateWorker::run()
 {
     buildCityMap();
+    emit finished();
 }
 
 void TimeZonePopulateWorker::buildCityMap()
 {
+    QList<TimeZoneLocationModel::TzLocation> locations;
     TzDB *tzdb = tz_load_db();
     GPtrArray *tz_locations = tz_get_locations(tzdb);
 
@@ -222,9 +223,11 @@
         g_free (state);
         g_free (full_country);
 
-        Q_EMIT (resultReady(tmpTz));
+        locations.append(tmpTz);
     }
 
+    qSort(locations.begin(), locations.end());
+    Q_EMIT (resultReady(locations));
     g_ptr_array_free (tz_locations, TRUE);
 }
 

=== modified file 'plugins/time-date/timezonelocationmodel.h'
--- plugins/time-date/timezonelocationmodel.h	2014-07-23 13:53:48 +0000
+++ plugins/time-date/timezonelocationmodel.h	2015-09-11 14:56:13 +0000
@@ -76,8 +76,7 @@
     void modelUpdated();
 
 public Q_SLOTS:
-    void processModelResult(TzLocation);
-    void store();
+    void store(QList<TzLocation> sortedLocations);
     void filterFinished();
 
 private:
@@ -85,7 +84,8 @@
     QList<TzLocation> m_originalLocations;
     QString m_pattern;
 
-    TimeZonePopulateWorker *m_workerThread;
+    QThread *m_workerThread;
+    TimeZonePopulateWorker *m_populateWorker;
 
     bool substringFilter(const QString& input);
     QFutureWatcher<TzLocation> m_watcher;
@@ -94,15 +94,16 @@
 
 Q_DECLARE_METATYPE (TimeZoneLocationModel::TzLocation)
 
-class TimeZonePopulateWorker : public QThread
+class TimeZonePopulateWorker : public QObject
 {
     Q_OBJECT
 
-public:
+public slots:
     void run();
 
 Q_SIGNALS:
-    void resultReady(TimeZoneLocationModel::TzLocation);
+    void resultReady(const QList<TimeZoneLocationModel::TzLocation> &sortedList);
+    void finished();
 
 private:
     void buildCityMap();