Merge lp:~albaguirre/unity-system-compositor/silo-virtual-output into lp:unity-system-compositor/ubuntu

[Alberto Aguirre]

DO NOT MERGE: silo test

DO NOT MERGE: silo test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-ci/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-xenial-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

277. By Alberto Aguirre on 2016-02-03

update version

276. By Alberto Aguirre on 2016-02-03

merge lp:mir/ubuntu

275. By Alberto Aguirre on 2016-02-03

mocks: Implement new method added to mir::graphics::Display

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-21 17:43:12 +0000
+++ CMakeLists.txt	2016-02-03 23:41:34 +0000
@@ -16,8 +16,8 @@
 
 project(UnitySystemCompositor)
 set(USC_VERSION_MAJOR 0)
-set(USC_VERSION_MINOR 3)
-set(USC_VERSION_PATCH 1)
+set(USC_VERSION_MINOR 5)
+set(USC_VERSION_PATCH 0)
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8)
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-01-28 14:20:54 +0000
+++ debian/changelog	2016-02-03 23:41:34 +0000
@@ -1,3 +1,9 @@
+unity-system-compositor (0.5.0) UNRELEASED; urgency=medium
+
+  * Test release server abi break 
+
+ -- Alberto Aguirre <[e-mail]>  Wed, 03 Feb 2016 17:39:47 -0600
+
 unity-system-compositor (0.4.0+16.04.20160128.1-0ubuntu1) xenial; urgency=medium
 
   [ Brandon Schaefer ]
 
=== modified file 'src/mir_screen.cpp'
--- src/mir_screen.cpp	2015-09-30 10:53:54 +0000
+++ src/mir_screen.cpp	2016-02-03 23:41:34 +0000
@@ -24,8 +24,13 @@
 #include <mir/graphics/display.h>
 #include <mir/graphics/display_configuration.h>
 #include <mir/input/touch_visualizer.h>
+#include <mir/log.h>
+#include <mir/report_exception.h>
 
 #include <cstdio>
+#include <sstream>
+
+#include <assert.h>
 #include "screen_hardware.h"
 #include "power_state_change_reason.h"
 #include "server.h"
@@ -33,6 +38,18 @@
 namespace mi = mir::input;
 namespace mg = mir::graphics;
 
+namespace
+{
+void log_exception_in(char const* const func)
+{
+    static char const* const warning_format = "%s failed: %s";
+    std::stringstream buffer;
+
+    mir::report_exception(buffer);
+    mir::log(::mir::logging::Severity::warning, "usc::MirScreen", warning_format, func, buffer.str().c_str());
+}
+}
+
 class usc::MirScreen::LockableCallback : public mir::LockableCallback
 {
 public:
@@ -48,8 +65,7 @@
 
     void unlock() override
     {
-        if (guard_lock.owns_lock())
-            guard_lock.unlock();
+        guard_lock.unlock();
     }
     
 protected:
@@ -63,7 +79,11 @@
 
     void operator()() override
     {
-        mir_screen->power_off_alarm_notification();
+        // We need to hold the lock before calling power_off_alarm_notification_l()
+        // (and not acquire it in that function) as we override the function to
+        // test for deadlock conditions. C.f. test_deadlock_lp1491566.cpp
+        assert(guard_lock.owns_lock());
+        mir_screen->power_off_alarm_notification_l();
     }
 };
 
@@ -73,7 +93,11 @@
 
     void operator()() override
     {
-        mir_screen->dimmer_alarm_notification();
+        // We need to hold the lock before calling dimmer_alarm_notification_l()
+        // (and not acquire it in that function) as we override the function to
+        // test for deadlock conditions. C.f. test_deadlock_lp1491566.cpp
+        assert(guard_lock.owns_lock());
+        mir_screen->dimmer_alarm_notification_l();
     }
 };
 
@@ -106,13 +130,21 @@
       allow_proximity_to_turn_on_screen{false},
       turned_on_by_user{true}
 {
-    /*
-     * Make sure the compositor is running as certain conditions can
-     * cause Mir to tear down the compositor threads before we get
-     * to this point. See bug #1410381.
-     */
-    compositor->start();
-    reset_timers_l(PowerStateChangeReason::inactivity);
+    try
+    {
+        /*
+         * Make sure the compositor is running as certain conditions can
+         * cause Mir to tear down the compositor threads before we get
+         * to this point. See bug #1410381.
+         */
+        compositor->start();
+        reset_timers_l(PowerStateChangeReason::inactivity);
+    }
+    catch (...)
+    {
+        log_exception_in(__func__);
+        throw;
+    }
 }
 
 usc::MirScreen::~MirScreen() = default;
@@ -186,8 +218,9 @@
 }
 
 void usc::MirScreen::set_screen_power_mode_l(MirPowerMode mode, PowerStateChangeReason reason)
+try
 {
-    if (!is_screen_change_allowed(mode, reason))
+    if (!is_screen_change_allowed_l(mode, reason))
         return;
 
     // Notifications don't turn on the screen directly, they rely on proximity events
@@ -233,8 +266,13 @@
         configure_display_l(mode, reason);
     }
 }
+catch (std::exception const&)
+{
+    log_exception_in(__func__);
+}
 
 void usc::MirScreen::configure_display_l(MirPowerMode mode, PowerStateChangeReason reason)
+try
 {
     if (reason != PowerStateChangeReason::proximity)
     {
@@ -292,6 +330,10 @@
     if (!power_on)
         screen_hardware->allow_suspend();
 }
+catch (std::exception const&)
+{
+    log_exception_in(__func__);
+}
 
 void usc::MirScreen::cancel_timers_l(PowerStateChangeReason reason)
 {
@@ -320,7 +362,7 @@
     if (!restart_timers)
         return;
 
-    auto const timeouts = timeouts_for(reason);
+    auto const timeouts = timeouts_for_l(reason);
     auto const now = clock->now();
 
     if (timeouts.power_off_timeout.count() > 0)
@@ -362,7 +404,7 @@
         cancel_timers_l(PowerStateChangeReason::inactivity);
 }
 
-usc::MirScreen::Timeouts usc::MirScreen::timeouts_for(PowerStateChangeReason reason)
+usc::MirScreen::Timeouts usc::MirScreen::timeouts_for_l(PowerStateChangeReason reason)
 {
     if (reason == PowerStateChangeReason::notification ||
         reason == PowerStateChangeReason::proximity ||
@@ -380,7 +422,7 @@
     }
 }
 
-bool usc::MirScreen::is_screen_change_allowed(MirPowerMode mode, PowerStateChangeReason reason)
+bool usc::MirScreen::is_screen_change_allowed_l(MirPowerMode mode, PowerStateChangeReason reason)
 {
     if (mode == MirPowerMode::mir_power_mode_on &&
         reason == PowerStateChangeReason::proximity &&
@@ -392,13 +434,13 @@
     return true;
 }
 
-void usc::MirScreen::power_off_alarm_notification()
+void usc::MirScreen::power_off_alarm_notification_l()
 {
     configure_display_l(MirPowerMode::mir_power_mode_off, PowerStateChangeReason::inactivity);
     next_power_off = {};
 }
 
-void usc::MirScreen::dimmer_alarm_notification()
+void usc::MirScreen::dimmer_alarm_notification_l()
 {
     if (current_power_mode != MirPowerMode::mir_power_mode_off)
         screen_hardware->set_dim_backlight();
 
=== modified file 'src/mir_screen.h'
--- src/mir_screen.h	2015-09-30 10:53:54 +0000
+++ src/mir_screen.h	2016-02-03 23:41:34 +0000
@@ -76,8 +76,8 @@
 
 protected:
     // These are protected virtual because we need to override them in tests
-    virtual void power_off_alarm_notification();
-    virtual void dimmer_alarm_notification();
+    virtual void power_off_alarm_notification_l();
+    virtual void dimmer_alarm_notification_l();
 
 private:
     enum class ForceResetTimers { no, yes };
@@ -92,8 +92,8 @@
     void reset_timers_l(PowerStateChangeReason reason);
     void reset_timers_ignoring_power_mode_l(PowerStateChangeReason reason, ForceResetTimers force);
     void enable_inactivity_timers_l(bool flag);
-    Timeouts timeouts_for(PowerStateChangeReason reason);
-    bool is_screen_change_allowed(MirPowerMode mode, PowerStateChangeReason reason);
+    Timeouts timeouts_for_l(PowerStateChangeReason reason);
+    bool is_screen_change_allowed_l(MirPowerMode mode, PowerStateChangeReason reason);
 
     void long_press_alarm_notification();
 
 
=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2015-11-12 12:28:17 +0000
+++ tests/include/usc/test/mock_display.h	2016-02-03 23:41:34 +0000
@@ -20,6 +20,7 @@
 #include "usc/test/stub_display_configuration.h"
 
 #include <mir/graphics/display.h>
+#include <mir/graphics/virtual_output.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -60,6 +61,9 @@
 
     std::unique_ptr<mir::graphics::GLContext> create_gl_context() override
     { return std::unique_ptr<mir::graphics::GLContext>{};};
+
+    std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int,int) override
+    { return nullptr; }
 };
 }
 }
 
=== modified file 'tests/integration-tests/test_deadlock_lp1491566.cpp'
--- tests/integration-tests/test_deadlock_lp1491566.cpp	2015-11-12 12:53:39 +0000
+++ tests/integration-tests/test_deadlock_lp1491566.cpp	2016-02-03 23:41:34 +0000
@@ -80,16 +80,16 @@
 public:
     using usc::MirScreen::MirScreen;
 
-    void dimmer_alarm_notification() override
+    void dimmer_alarm_notification_l() override
     {
         before_dimmer_alarm_func();
-        usc::MirScreen::dimmer_alarm_notification();
+        usc::MirScreen::dimmer_alarm_notification_l();
     }
 
-    void power_off_alarm_notification() override
+    void power_off_alarm_notification_l() override
     {
         before_power_off_alarm_func();
-        usc::MirScreen::power_off_alarm_notification();
+        usc::MirScreen::power_off_alarm_notification_l();
     }
 
     std::function<void()> before_dimmer_alarm_func = []{};