Feat/message size #353
Merged
Feat/message size #353
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
Stebalien
requested changes
Jun 17, 2019
dht_net.go
Outdated
| @@ -71,7 +72,7 @@ func (dht *IpfsDHT) handleNewStream(s network.Stream) { | |||
| // Returns true on orderly completion of writes (so we can Close the stream). | |||
| func (dht *IpfsDHT) handleNewMessage(s network.Stream) bool { | |||
| ctx := dht.ctx | |||
| r := ggio.NewDelimitedReader(s, network.MessageSizeMax) | |||
| r := msgio.NewVarintReader(s) | |||
There was a problem hiding this comment.
You can now (after updating msgio) specify a size.
dht_net.go
Outdated
| ) | ||
| return false | ||
| } | ||
| switch err := req.Unmarshal(msgbytes); err { |
There was a problem hiding this comment.
The EOF check applies to the ReadMsg call.
| @@ -80,14 +81,24 @@ func (dht *IpfsDHT) handleNewMessage(s network.Stream) bool { | |||
|
|
|||
| for { | |||
| var req pb.Message | |||
| switch err := r.ReadMsg(&req); err { | |||
| msgbytes, err := r.ReadMsg() | |||
There was a problem hiding this comment.
We need to call r.ReturnMsg somewhere to return it to the pool when done.
|
related: ipfs/go-bitswap#143 |
Update msgio to latest version Use max size in msgio readers Fix error handling in reads
|
comments addressed @Stebalien! bumped msgio version |
Stebalien
approved these changes
Jun 18, 2019
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.
Closes #346.
I thought about retrofitting the writer pool at first. Looking into the implementation of the
ggiodelimited writer, I found that the comment here was actually incorrect, and that the entire message is written to a byte buffer before being written to the underlyingWriter. Should we discharge the pool entirely? Or is it worth simplifying the implementation to use a buffer pool and a sharedmsgiovarint writer?