Merge lp:~mir-team/mir/fix-1339700-take2-in-0.4 into lp:mir/0.4
Status: | Rejected |
---|---|
Rejected by: | Daniel van Vugt |
Proposed branch: | lp:~mir-team/mir/fix-1339700-take2-in-0.4 |
Merge into: | lp:mir/0.4 |
Diff against target: |
191 lines (+89/-7) 5 files modified
debian/changelog (+10/-0) src/server/asio_main_loop.cpp (+26/-3) src/server/compositor/buffer_queue.h (+3/-1) src/server/compositor/timeout_frame_dropping_policy_factory.cpp (+4/-3) tests/unit-tests/test_asio_main_loop.cpp (+46/-0) |
To merge this branch: | bzr merge lp:~mir-team/mir/fix-1339700-take2-in-0.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Disapprove | ||
Review via email: mp+226537@code.launchpad.net |
Commit message
Ensure AlarmImpl is not locked during callbacks to arbitrary user code so
that it can't form a deadlock with the caller's own mutexes. (LP: #1339700).
Description of the change
Ensure AlarmImpl is not locked during callbacks to arbitrary user code so
that it can't form a deadlock with the caller's own mutexes. (LP: #1339700)
This is a combination of devel r1766 and https:/
Unmerged revisions
- 1742. By Alberto Aguirre
-
Update changelog
- 1741. By Alberto Aguirre
-
Only ~AlarmImpl should wait for callback completion (LP: #1339700)
Keep the semantics of AlarmImpl::cancel similar to boost::
::deadline_ timer. However,
make the destructor of ~AlarmImpl wait for current executing callbacks to avoid lifetime
issues. In the future, mir::time::Alarm should expose the stop method. - 1740. By Alberto Aguirre
-
Ensure AlarmImpl is not locked during callbacks to arbitrary user code so
that it can't form a deadlock with the caller's own mutexes. - 1739. By Daniel van Vugt
-
Correct the changelog text for 0.4.0+14.
10.20140701. 1-0ubuntu1. It mistakenly listed enhancements under ABI/API changes and didn't mention
most of the bugs that got fixed. - 1738. By Daniel van Vugt
-
Merge released changelog from lp:mir ...
mir (0.4.0+14.10.20140701. 1-0ubuntu1) utopic; urgency=medium - 1737. By Daniel van Vugt
-
Revert my corrections from r1736. Annoyingly Tarmac lost it and landed r1735
to lp:mir instead :(Also moved the v0.4.0 tag to accurately reflect which revision got released.
- 1736. By Daniel van Vugt
-
Corrections to the new debian/changelog entry for 0.4.0
- 1735. By Cemil Azizoglu
-
Merge r1737 and r1738 from devel.
- 1734. By Cemil Azizoglu
-
Integrate r1734 from devel.
- 1733. By Cemil Azizoglu
-
Update changelog.
Resubmit.
This proposal merges a couple of different branches, one of which is not approved and needs fixing upstream still: /code.launchpad .net/~mir- team/mir/ fix-1339700- take2/+ merge/226534
https:/