This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Fixed potential deadlock on startup #592
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
| @@ -400,7 +400,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone { | |||
| // public_endpoint in host info contains local adderss at this point | |||
| let listen_address = self.info.read().unwrap().public_endpoint.address.clone(); | |||
| let udp_port = self.info.read().unwrap().config.udp_port.unwrap_or(listen_address.port()); | |||
| let public_endpoint = match self.info.read().unwrap().config.public_address { | |||
| let public_address = self.info.read().unwrap().config.public_address.clone(); | |||
| let public_endpoint = match public_address { | |||
There was a problem hiding this comment.
Here self.info was not released till the end of the match expression. If there is another attempt to write-lock it between here and line 408 there would be a deadlock
There was a problem hiding this comment.
could this be placed on a single line with:
let public_endpoint = match {self.info.read().unwrap().config.public_address.clone()} {
There was a problem hiding this comment.
Surprisingly this does not work.
http://is.gd/1Pf3kO
NikVolf
added
A8-looksgood 🦄
gavofyork
pushed a commit
that referenced
this pull request
Mar 4, 2016
Fixed potential deadlock on startup
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.