Merge lp:~mterry/unity-system-compositor/kill-spinner into lp:unity-system-compositor

[Michael Terry]

Kill the boot animation spinner when not needed, saving resources

Kill the boot animation spinner when not needed, saving resources.

I also re-start the spinner if we need it for interstitials (which doesn't happen on phone right now, but will on desktop and maybe future phone versions). I originally kept it running for speed-of-switching-to-interstitials, but resources are more important than the brief moment we'd wait for the spinner to start up again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/122/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

FYI, KGunn confirmed that this works correctly in the linked bug.

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[Mirco Müller (macslow)]

+1

[Mirco Müller (macslow)]

+1 now with the correct review-status *sigh*

review: Approve

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2014-06-18 14:48:35 +0000
+++ src/system_compositor.cpp	2014-06-19 22:05:52 +0000
@@ -222,6 +222,7 @@
         auto spinner = sessions[spinner_name];
         auto next = sessions[next_name];
         auto active = sessions[active_name];
+        bool need_spinner = false;
 
         if (spinner)
             spinner->hide();
@@ -238,9 +239,11 @@
             std::cerr << "Setting next focus to spinner";
             spinner->raise(surface_coordinator);
             next_session = spinner;
+            need_spinner = true;
         }
         else
         {
+            need_spinner = !next_name.empty();
             std::cerr << "Setting no next focus";
             next_session.reset();
         }
@@ -266,9 +269,11 @@
             focus_controller->set_focus_to(spinner); // raises and focuses
             active_session = spinner;
             next_session.reset();
+            need_spinner = true;
         }
         else
         {
+            need_spinner = need_spinner || !active_name.empty();
             std::cerr << "; no active focus";
             active_session.reset();
             next_session.reset();
@@ -279,6 +284,11 @@
         if (next_session)
             next_session->show();
 
+        if (need_spinner)
+            compositor->ensure_spinner();
+        else
+            compositor->kill_spinner();
+
         std::cerr << std::endl;
     }
 
@@ -764,9 +774,9 @@
     io_service.run();
 }
 
-void SystemCompositor::launch_spinner()
+void SystemCompositor::ensure_spinner()
 {
-    if (config->spinner().empty())
+    if (config->spinner().empty() || spinner_process.state() != QProcess::NotRunning)
         return;
 
     // Launch spinner process to provide default background when a session isn't ready
@@ -776,10 +786,15 @@
     spinner_process.start(config->spinner().c_str());
 }
 
+void SystemCompositor::kill_spinner()
+{
+    spinner_process.close();
+}
+
 void SystemCompositor::qt_main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
     DBusScreen dbus_screen(config, config->power_off_delay());
-    launch_spinner();
+    ensure_spinner();
     app.exec();
 }

=== modified file 'src/system_compositor.h'
--- src/system_compositor.h	2014-05-01 16:22:43 +0000
+++ src/system_compositor.h	2014-06-19 22:05:52 +0000
@@ -34,6 +34,8 @@
     void pause();
     void resume();
     pid_t get_spinner_pid() const;
+    void ensure_spinner();
+    void kill_spinner();
 
 private:
     std::shared_ptr<SystemCompositorServerConfiguration> config;
@@ -46,7 +48,6 @@
     void set_next_session(std::string client_name);
     void main();
     void qt_main(int argc, char **argv);
-    void launch_spinner();
 };
 
 #endif /* SYSTEM_COMPOSITOR_H_ */