Merge lp:~ricmm/qtmir/delay-add-on-dash-start into lp:qtmir

[Ricardo Mendoza]

Delay adding Application to model when launching app from the Dash via url-dispatcher (for fast exec).

N.B. The same logic is not applied to the startApplication() method because this one is not in a blocking path for UAL's callbacks, therefore adding the Application to the model right away introduces no delays to the final exec()

(Savings are ~200ms)

[lp:~ricmm/qtmir/delay-add-on-dash-start]

239. By Ricardo Mendoza on 2014-08-20

Sync

[Daniel d'Andrada (dandrader)]

There's some merge conflict leftovers in debian/changelog.

For the commit message we use the following format: a short summary (up to 80 or 90 chars) followed by an empty line and then a long description, if any.

[Daniel d'Andrada (dandrader)]

> There's some merge conflict leftovers in debian/changelog.

Ah, you're actually removing them. Nevermind
Must be due to the prerequisite...

[lp:~ricmm/qtmir/delay-add-on-dash-start]

240. By Ricardo Mendoza on 2014-08-20

Merge lttng

241. By Ricardo Mendoza on 2014-08-20

Fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/qtmir-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/qtmir-ci/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/24/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

The bad thing about this is that the UI does not respond to a user launching an application *immediately* - now the UI only reacts when the application launches and tries to authorize with Mir. As a result, app launching feels slightly slower.

I'd prefer we call add(application) as soon as possible.

This also does not behave well when a user-launched app fails to start (before authorizing) - the application will remain in m_startingApplications forever.

review: Needs Fixing

Unmerged revisions

241. By Ricardo Mendoza on 2014-08-20

Fix

240. By Ricardo Mendoza on 2014-08-20

Merge lttng

239. By Ricardo Mendoza on 2014-08-20

Sync

238. By Ricardo Mendoza on 2014-08-20

Delay adding Application to model when in app launch fast-path (launched from Dash by url-dispatcher)

237. By Ricardo Mendoza on 2014-08-20

Merge lp:~gerboland/qtmir/lttng

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-08-20 18:52:14 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-08-20 18:52:14 +0000
@@ -187,6 +187,10 @@
     connectToSurfacePlacementStrategy(appManager, placementStrategy);
     connectToTaskController(appManager, taskController.data());
 
+    QObject::connect(appManager, &ApplicationManager::addApplication,
+                     appManager, &ApplicationManager::onAddApplication,
+                     Qt::QueuedConnection);
+
     return appManager;
 }
 
@@ -564,7 +568,7 @@
         if (application->stage() == Application::SideStage && forceAllAppsIntoMainStage(m_mirConfig))
             application->setStage(Application::MainStage);
 
-        add(application);
+        m_startingApplications.append(application);
         Q_EMIT focusRequested(appId);
     }
     else {
@@ -740,11 +744,13 @@
 
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::authorizeSession - pid=" << pid;
 
-    for (Application *app : m_applications) {
+    for (Application *app : m_startingApplications) {
         if (app->state() == Application::Starting) {
             tracepoint(qtmir, appIdHasProcessId_start);
             if (m_taskController->appIdHasProcessId(app->appId(), pid)) {
                 app->setPid(pid);
+                // Use delayed add as this is the fast-path
+                Q_EMIT addApplication(app);
                 authorized = true;
                 tracepoint(qtmir, appIdHasProcessId_end, 1); //found
                 return;
@@ -1005,6 +1011,12 @@
         return m_sideStageApplication;
 }
 
+void ApplicationManager::onAddApplication(Application* application)
+{
+    add(application);
+    m_startingApplications.removeOne(application);
+}
+
 void ApplicationManager::add(Application* application)
 {
     Q_ASSERT(application != nullptr);

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2014-08-20 18:52:14 +0000
+++ src/modules/Unity/Application/application_manager.h	2014-08-20 18:52:14 +0000
@@ -139,9 +139,11 @@
 
 Q_SIGNALS:
     void emptyChanged();
+    void addApplication(Application* application);
 
 private Q_SLOTS:
     void screenshotUpdated();
+    void onAddApplication(Application* application);
 
 private:
     void setFocused(Application *application);
@@ -160,6 +162,7 @@
     QSharedPointer<MirServerConfiguration> m_mirConfig;
 
     QList<Application*> m_applications;
+    QList<Application*> m_startingApplications;
     Application* m_focusedApplication;
     Application* m_mainStageApplication;
     Application* m_sideStageApplication;