lp:~alan-griffiths/mir/fix-1535894

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Kevin DuBois (community): Approve on 2016-02-05

Daniel van Vugt: Needs Fixing on 2016-02-05

PS Jenkins bot (community): Approve (continuous-integration) on 2016-02-04

Mir CI Bot: Needs Fixing (continuous-integration) on 2016-02-04

Diff: 112 lines (+38/-1)

6 files modified

include/server/mir/compositor/scene.h (+2/-0)
src/server/compositor/multi_threaded_compositor.cpp (+2/-1)
src/server/scene/surface_stack.cpp (+25/-0)
src/server/scene/surface_stack.h (+1/-0)
tests/include/mir/test/doubles/mock_scene.h (+4/-0)
tests/include/mir/test/doubles/stub_scene.h (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3296. By Alan Griffiths on 2016-02-04

I wonder why that passes locally

3295. By Alan Griffiths on 2016-02-04

Filter Scene::frames_pending() by output area

3294. By Alan Griffiths on 2016-02-04

frontend: replace configurable "IPC thread pool" with a single thread.

Approved by Daniel van Vugt, mir-ci-bot, PS Jenkins bot, Kevin DuBois.

3293. By Alan Griffiths on 2016-02-04

tools: rm tools/install_on_android.sh.

Approved by Daniel van Vugt, PS Jenkins bot, Kevin DuBois, mir-ci-bot.

3292. By Daniel van Vugt on 2016-02-04

debian/changelog: s/loggging/logging/

3291. By Alan Griffiths on 2016-02-03

tests: Add a small delay to ensure the TestClientCursorAPI.cursor_passed_through_nested_server test conditions are set up correctly. Fixes: https://bugs.launchpad.net/bugs/1525003.

Approved by Alexandros Frantzis, mir-ci-bot, Kevin DuBois, Alberto Aguirre, PS Jenkins bot.

3290. By Alberto Aguirre on 2016-02-03

Bump server/platforms ABI.

Approved by Alan Griffiths, Andreas Pokorny, PS Jenkins bot, Kevin DuBois, mir-ci-bot.

3289. By Daniel van Vugt on 2016-02-03

 Forward-port kgunn's changelog update (fixes a TODO for 0.19.0)
.

Approved by Kevin DuBois, Alan Griffiths, PS Jenkins bot, mir-ci-bot.

3288. By Andreas Pokorny on 2016-02-03

input: Copy output rectangles when configuration changes

DisplayInputRegion used to calculate a set of rectangles on every mouse event, even when the set of outputs rarely changes. This change keeps a mir::geometry::Rectangles as cache. The actual dead lock of lp:1538632 was caused by the fact that DisplauInputRegion would use - to calculate the mir::geometry::Rectangles - the following locks in the given order:
  * mir::graphics::Display::configuration_mutex via for_each_display_sync_group()
  * mir::graphics::DisplayGroup::guard via for_each_display_buffer()

Simultaneously the SystemWindowManager::add_display method is called by the CompositingFunctor, which uses DisplaySyncGroup::for_each_display_buffer, and deeper in the call tree GraphicsDisplayLayout would request a copy of the DisplayConfiguration during place_in_output, which results in the reverse lock ordering:
  * mir::graphics::DisplayGroup::guard via for_each_display_buffer()
  * mir::graphics::Display::configuration_mutex via configration()

This change makes sure that the DisplayInputRegion does not touch any locks used by the graphics platform during input event handling. Fixes: https://bugs.launchpad.net/bugs/1538632.

Approved by Kevin DuBois, Alan Griffiths, PS Jenkins bot, mir-ci-bot.

3287. By Alberto Aguirre on 2016-02-02

Fix make release-checks

The target should fail when symbols contain "unreleased" in their names.

Approved by PS Jenkins bot, mir-ci-bot, Alan Griffiths, Daniel van Vugt.