summaryrefslogtreecommitdiffstats
path: root/testing/mozbase/mozsystemmonitor
Commit message (Collapse)AuthorAgeLines
* Bug 1384062 - Make SystemResourceMonitor.stop more resilient to errors. ↵Mike Hommey2018-05-16-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=ahal,gps The poll() call in SystemResourceMonitor.stop might fail even though there is something to read from the pipe, in some corner cases, and python won't let us know about it. In that case, an exception is thrown, leaving the SystemResourceMonitor (and its callers) in a weird state. In practice, this leads BuildMonitor.__exit__ to recall stop, which then fails. So when poll() throws an exception, we pretend there's still something to read, and we try to read anyways. If there is something to read, recv() will return it, otherwise, it will throw an exception of its own, which we catch, pretending we're done. Furthermore, when there is nothing to read from the pipe, poll() simply returns False, and our loop never sets `done` to True, and we then hit an assert, which doesn't have its place here, so we remove it. Finally, the other end of the pipe might have died at any time, making sending over the pipe fail, so we also protect against that. With all these changes, it feels like the reason to backout bug 1239939 in bug 1272782 should have been dealt with, and we can drop the timeout again. --HG-- extra : rebase_source : ac72dd5b2602cf3ffddfb429f95e02380f939893
* Add m-esr52 at 52.6.0Matt A. Tobin2018-02-02-0/+898