add a MemoryManager #69
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
marten-seemann
commented
Jan 5, 2022
| if !ok { | ||
| return | ||
| } | ||
| s.memoryManager.ReleaseMemory(int(str.recvWindow)) |
There was a problem hiding this comment.
We could use a transactional scope here, but it's easy enough to just release the memory manually.
marten-seemann
commented
Jan 5, 2022
| return ErrDuplicateStream | ||
| } | ||
|
|
||
| if s.numIncomingStreams >= s.config.MaxIncomingStreams { | ||
| // too many active streams at the same time | ||
| s.logger.Printf("[WARN] yamux: MaxIncomingStreams exceeded, forcing stream reset") | ||
| delete(s.streams, id) |
There was a problem hiding this comment.
Note that at this point we haven't inserted the stream into the map yet, so this delete was not needed in the first place.
vyzo
reviewed
Jan 5, 2022
stream.go
Outdated
Comment on lines
229
to
231
| if err == nil && status == MemoryStatusOK { | ||
| s.recvWindow = recvWindow | ||
| _, delta = s.recvBuf.GrowTo(s.recvWindow, true) | ||
| } |
There was a problem hiding this comment.
wait here we have to release memory back if it is Caution or Critical but the error is nil, as it was actually reserved!
69 tasks
marten-seemann
force-pushed
the
rcmgr
branch
2 times, most recently
from
4a4f886 to
35fc6dc
Compare
vyzo
requested changes
Jan 11, 2022
vyzo
approved these changes
Jan 13, 2022
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.
No description provided.