Merge lp:~thomas-voss/unity-system-compositor/fallback-gracefully-if-hw-api-is-missing-0.4 into lp:unity-system-compositor/0.4

[Thomas Voß]

Gracefully fallback if ubuntu's platform hw api is not available.

Cherry pick r285 from lp:unity-system-compositor.

Gracefully fallback if ubuntu's platform hw api is not available.

Cherry pick r285 from lp:unity-system-compositor.

[Kevin DuBois (kdub)]

would be better if we had an interface and runtime detection, but alright as a cherry pick to solve a problem.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-11 14:43:18 +0000
+++ CMakeLists.txt	2016-03-22 12:04:55 +0000
@@ -49,6 +49,10 @@
 find_package(GLESv2 REQUIRED)
 find_package(PIL REQUIRED)
 
+if (UBUNTU_PLATFORM_HARDWARE_API_FOUND)
+  add_definitions(-DUSC_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+endif()
+
 add_subdirectory(spinner/)
 add_subdirectory(src/)
 

=== modified file 'debian/control'
--- debian/control	2016-03-11 14:43:18 +0000
+++ debian/control	2016-03-22 12:04:55 +0000
@@ -21,7 +21,7 @@
                python:any (>= 2.7),
                python-setuptools,
                python-pil,
-               libubuntu-platform-hardware-api-dev,
+               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc !s390x],
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-system-compositor
 # if you don't have have commit access to this branch but would like to upload

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-03-11 14:43:18 +0000
+++ src/CMakeLists.txt	2016-03-22 12:04:55 +0000
@@ -14,6 +14,12 @@
 #
 # Authored by: Robert Ancell <[e-mail]>
 
+if (UBUNTU_PLATFORM_HARDWARE_API_FOUND)
+  set(PERFORMANCE_BOOSTER_IMPL_SRCS hw_performance_booster.cpp null_performance_booster.cpp)
+else()
+  set(PERFORMANCE_BOOSTER_IMPL_SRCS null_performance_booster.cpp)
+endif()
+
 set(USC_SRCS
   asio_dm_connection.cpp
   dbus_connection_handle.cpp
@@ -21,11 +27,10 @@
   dbus_message_handle.cpp
   display_configuration_policy.cpp
   external_spinner.cpp  
-  hw_performance_booster.cpp
   mir_screen.cpp
   mir_input_configuration.cpp
-  null_performance_booster.cpp
   performance_booster.h
+  performance_booster.cpp
   powerd_mediator.cpp
   screen_event_handler.cpp
   server.cpp
@@ -39,6 +44,8 @@
   unity_screen_service.cpp
   unity_screen_service_introspection.h
   window_manager.cpp
+
+  ${PERFORMANCE_BOOSTER_IMPL_SRCS}
 )
 
 # Generate unity_screen_service_introspection.h from the introspection XML file

=== added file 'src/performance_booster.cpp'
--- src/performance_booster.cpp	1970-01-01 00:00:00 +0000
+++ src/performance_booster.cpp	2016-03-22 12:04:55 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#define MIR_LOG_COMPONENT "UnitySystemCompositor"
+
+#include "performance_booster.h"
+#include "null_performance_booster.h"
+
+#include <mir/log.h>
+
+#include <boost/exception/all.hpp>
+
+#if defined(USC_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+#include "hw_performance_booster.h"
+
+std::shared_ptr<usc::PerformanceBooster> usc::platform_default_performance_booster()
+{
+    // We are treating access to a functional implementation of PerformanceBooster as optional.
+    // With that, we gracefully fall back to a NullImplementation if we cannot gain access
+    // to hw-provided booster capabilities.
+    try
+    {
+        return std::make_shared<HwPerformanceBooster>();
+    }
+    catch (boost::exception const& e)
+    {
+        mir::log_warning(boost::diagnostic_information(e));
+    }
+
+    return std::make_shared<NullPerformanceBooster>();
+}
+#else
+std::shared_ptr<usc::PerformanceBooster> usc::platform_default_performance_booster()
+{
+    return std::make_shared<NullPerformanceBooster>();
+}
+#endif // USC_HAVE_UBUNTU_PLATFORM_HARDWARE_API

=== modified file 'src/performance_booster.h'
--- src/performance_booster.h	2016-03-11 14:43:18 +0000
+++ src/performance_booster.h	2016-03-22 12:04:55 +0000
@@ -19,6 +19,8 @@
 #ifndef USC_PERFORMANCE_BOOSTER_H_
 #define USC_PERFORMANCE_BOOSTER_H_
 
+#include <memory>
+
 namespace usc
 {
 class PerformanceBooster
@@ -32,6 +34,8 @@
     virtual void enable_performance_boost_during_user_interaction() = 0;
     virtual void disable_performance_boost_during_user_interaction() = 0;
 };
+
+std::shared_ptr<PerformanceBooster> platform_default_performance_booster();
 }
 
 #endif // USC_PERFORMANCE_BOOSTER_H_

=== modified file 'src/server.cpp'
--- src/server.cpp	2016-03-11 14:43:18 +0000
+++ src/server.cpp	2016-03-22 12:04:55 +0000
@@ -26,13 +26,12 @@
 #include "mir_screen.h"
 #include "mir_input_configuration.h"
 #include "screen_event_handler.h"
+#include "performance_booster.h"
 #include "powerd_mediator.h"
 #include "unity_screen_service.h"
 #include "unity_input_service.h"
 #include "dbus_connection_thread.h"
 #include "dbus_event_loop.h"
-#include "hw_performance_booster.h"
-#include "null_performance_booster.h"
 #include "display_configuration_policy.h"
 #include "steady_clock.h"
 
@@ -210,19 +209,7 @@
 
 std::shared_ptr<usc::PerformanceBooster> usc::Server::the_performance_booster()
 {
-    // We are treating access to a functional implementation of PerformanceBooster as optional.
-    // With that, we gracefully fall back to a NullImplementation if we cannot gain access
-    // to hw-provided booster capabilities.
-    try
-    {
-        return std::make_shared<HwPerformanceBooster>();
-    }
-    catch (boost::exception const& e)
-    {
-        mir::log_warning(boost::diagnostic_information(e));
-    }
-
-    return std::make_shared<NullPerformanceBooster>();
+    return platform_default_performance_booster();
 }
 
 std::shared_ptr<usc::Spinner> usc::Server::the_spinner()