Граф коммитов

2 Коммитов

Автор SHA1 Сообщение Дата
Alan Jeffrey 208cea2587 servo: Merge #13472 - Don't log in the middle of mutating a reentrant lock (from asajeffrey:util-remutex-dont-log-while-mutating-lock); r=jdm
<!-- Please describe your changes on the following line: -->

Moved assertion that we are the lock owner to after the lock release. The problem is that Servo uses a reentrant lock for logging, so logging in the middle of mutating the lock is A Bad Idea.

While I was at it, I tidied up the reentrant lock code.

cc @jdm

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13463.
- [X] These changes do not require tests because they fix an existing intermittent.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 318b23ed0047cc39625ca2f33a55d647b5886019
2016-10-04 16:01:40 -05:00
Michael Howell 5637a89704 servo: Merge #12629 - Intermittents (from notriddle:intermittents); r=aneeshusa
We probably want to have Buildbot run that script.

---

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12435, #11574, and #11561
- [X] These changes do not require tests because reasons

Source-Repo: https://github.com/servo/servo
Source-Revision: 944cbbff8ba75b0fc493222923137be35c701aca

--HG--
rename : servo/python/tidy/servo_tidy_tests/test_ignored/whee/foo/bar.rs => servo/etc/ci/former_intermittents_wpt.txt
2016-08-09 23:28:17 -05:00