Merge lp:~unity-team/qtmir/ghostApps-preemptQuitters into lp:qtmir

[Gerry Boland]

AppMan: if app destroys surface while in Running state, it is probably shutting down, so preempt it by removing it from the model

AppMan: if app destroys surface while in Running state, it is probably shutting down, so preempt it by removing it from the model

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/105/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

This could result in processes hanging around. If app decides to destroy its window, with this patch, appMan stops listing it. But that app could keep running in the background, and user has no way of knowing and no way of stopping that.

One idea would be on surface destrction, start a timer for 5 seconds, after which we ensure the process is dead, or have it killed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/107/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

I think the intelligence should remain all in Application, with ApplicationManager being solely a demultiplexer of signals to Applications.

[Daniel d'Andrada (dandrader)]

But since this is an emergency, I'm ok with having it for now.

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2015-08-21 11:36:11 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2015-08-21 11:36:11 +0000
@@ -82,6 +82,8 @@
                      manager, &ApplicationManager::onSessionStopping);
     QObject::connect(listener, &SessionListener::sessionCreatedSurface,
                      manager, &ApplicationManager::onSessionCreatedSurface);
+    QObject::connect(listener, &SessionListener::sessionDestroyingSurface,
+                     manager, &ApplicationManager::onSessionDestroyingSurface);
 }
 
 void connectToSessionAuthorizer(ApplicationManager *manager, SessionAuthorizer *authorizer)
@@ -671,6 +673,23 @@
     }
 }
 
+void ApplicationManager::onSessionDestroyingSurface(ms::Session const* session,
+                                                    std::shared_ptr<ms::Surface> const& surface)
+{
+    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::onSessionDestroyingSurface - sessionName=" << session->name().c_str();
+    Q_UNUSED(surface);
+
+    Application* application = findApplicationWithSession(session);
+    if (application && application->state() == Application::Running) {
+        // If app in Running state but it destroys its surface, it's probably shutting down,
+        // in which case, we can preempt it and remove it from the App list immediately.
+        // FIXME: this is not desktop application friendly, but resolves issue where trust-prompt
+        // helpers take a long time to shut down, but destroys their surface quickly.
+        remove(application);
+        application->deleteLater();
+    }
+}
+
 Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
 {
     return findApplicationWithSession(session.get());

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2015-05-27 21:07:45 +0000
+++ src/modules/Unity/Application/application_manager.h	2015-08-21 11:36:11 +0000
@@ -121,6 +121,8 @@
     void onSessionStopping(std::shared_ptr<mir::scene::Session> const& session);
 
     void onSessionCreatedSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const&);
+    void onSessionDestroyingSurface(mir::scene::Session const* session,
+                                    std::shared_ptr<mir::scene::Surface> const& surface);
 
     void onProcessStarting(const QString& appId);
     void onProcessStopped(const QString& appId);