monitor-fds: Fix on macOS. #1872
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Testing this on my box now, but based on the simplified tests I fully expect it to work. |
copumpkin
reviewed
Feb 14, 2018
src/libutil/monitor-fd.hh
Outdated
| fds[0].events = 0; | ||
| /* This shouldn't be necessary, but macOS doesn't seem to | ||
| like a zeroed out events field. | ||
| See https://openradar.appspot.com/radar?id=5047895313088512 |
|
Ugh, hitting the assertion on the next line, digging in... |
|
poll is timing out even with a |
|
Seems related... curl/curl#1057 |
shlevy
force-pushed
the
macOS-poll-fix
branch
from
953cd66
to
9fd78c0
Compare
|
OK, this is tested and working. Ugly, but so is the problem domain. |
shlevy
commented
Feb 14, 2018
src/libutil/monitor-fd.hh
Outdated
| fds[0].events = POLLHUP; | ||
| auto count = poll(fds, 1, -1); | ||
| if (count == -1) abort(); // can't happen | ||
| if (count == 0) continue; // shouldn't happen, but macOS is terrbile |
There was a problem hiding this comment.
We may want to insert a delay here if this turns out to cause lots of spinning.
shlevy
force-pushed
the
macOS-poll-fix
branch
from
9fd78c0
to
ac973a6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1871.