Auto merge of #13472 - asajeffrey:util-remutex-dont-log-while-mutating-lock, r=jdm

Don't log in the middle of mutating a reentrant lock

<!-- 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. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13472)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-04 16:01:40 -05:00 committed by GitHub
commit 318b23ed00
2 changed files with 27 additions and 9 deletions

View file

@ -1,3 +1,4 @@
/css-flexbox-1_dev/html/flexbox-basic-iframe-vert-001.htm
/css-transforms-1_dev/html/transform-table-007.htm
/css-transforms-1_dev/html/transform-abspos-002.htm
/css-transforms-1_dev/html/transform-abspos-007.htm