Fix context.term() deadlock #23
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
This change fixes a deadlock when calling context.term() while socket operations are still ongoing in other greenlets. It allows errors from the `getsockopt()` call triggered by state changes to propagate into the waiting greenlet.
The overridden `Socket.close()` was inspecting `self.closed`, which resulted in a call to `zmq_getsockopt()`, which was raising the `ETERM` again. It now uses the `self._closed` attribute instead of the property, which doesn't seem to have any adverse effects on socket-closing semantics.
If the context is terminated just at the right time, the __state_changed() method might be in progress, and when it checks `self.closed` it will raise an `ETERM` in the event loop (again, rather than the waiting greenlet). I've fixed it by putting the check in the same try/except as the `getsockopt()` call.
|
Zachary, thank you for your work here, using AsyncResult is clearly more reasonable. Merging! |
tmc
added a commit
that referenced
this pull request
Jan 6, 2012
Fix context.term() deadlock, switch to AsyncResult for improved exception handling.
Closed
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.
This pull request fixes issue #22. See that issue page for comprehensive details.