With more effort, I have now bisected the issue and found it was fixed by r2690:
------------------------------------------------------------
revno: 2690 [merge]
author: Alberto Aguirre <email address hidden>
committer: Tarmac
branch nick: development-branch
timestamp: Sat 2015-06-20 00:13:06 +0000
message:
Fix potential data races and mutex locking order issues.
Avoid FD data race in AsyncServerRunner
Avoid data race on display_server pointer in ServerRunner
Avoid potential lock ordering issues in mir::client::ConnectionSurfaceMap.
Approved by PS Jenkins bot, Alan Griffiths.
------------------------------------------------------------
Confirmed r2722 does not have the bug.
With more effort, I have now bisected the issue and found it was fixed by r2690:
------- ------- ------- ------- ------- ------- ------- ------- ----
revno: 2690 [merge]
author: Alberto Aguirre <email address hidden>
committer: Tarmac
branch nick: development-branch
timestamp: Sat 2015-06-20 00:13:06 +0000
message:
Fix potential data races and mutex locking order issues.
Avoid FD data race in AsyncServerRunner :ConnectionSurf aceMap.
Avoid data race on display_server pointer in ServerRunner
Avoid potential lock ordering issues in mir::client:
Approved by PS Jenkins bot, Alan Griffiths. ------- ------- ------- ------- ------- ------- ------- ----
-------