-
Notifications
You must be signed in to change notification settings - Fork 48
Fix memory allocation in countingReader #38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tyaps
wants to merge
1
commit into
sassoftware:master
Choose a base branch
from
tyaps:fix-memory-allocation
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or 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
3749ace
to
e197fa8
Compare
Currently, countingReader.Seek() uses io.ReadFull() to read data, so memory is allocated for all content of rpm file (and content has no meaning here because only offset of reader must be changed). So while parsing header of big rpm file, a lot of memory allocates. Use reading by small chunks. Signed-off-by: Sergey Tyapkin <[email protected]>
e197fa8
to
3e4227d
Compare
Hello. Is there a chance for this PR to be merged?)) |
mtharp
reviewed
Mar 18, 2025
Comment on lines
+149
to
+174
totalRead := int64(0) | ||
const chunkSize = int64(1024 * 1024) | ||
buf := make([]byte, chunkSize) | ||
|
||
remaining := offset | ||
for remaining > 0 { | ||
// Define chunk size to read | ||
toRead := chunkSize | ||
if remaining < chunkSize { | ||
toRead = remaining | ||
} | ||
|
||
n, err := cr.Read(buf[:toRead]) | ||
totalRead += int64(n) | ||
remaining -= int64(n) | ||
if err != nil && err != io.EOF { | ||
// If all was read, skip error | ||
if totalRead >= offset { | ||
err = nil | ||
} | ||
return 0, err | ||
} | ||
|
||
if err == io.EOF { | ||
break | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, thanks for your contribution! This is definitely worth fixing.
I believe this can be addressed much more simply by using io.Discard
:
Suggested change
totalRead := int64(0) | |
const chunkSize = int64(1024 * 1024) | |
buf := make([]byte, chunkSize) | |
remaining := offset | |
for remaining > 0 { | |
// Define chunk size to read | |
toRead := chunkSize | |
if remaining < chunkSize { | |
toRead = remaining | |
} | |
n, err := cr.Read(buf[:toRead]) | |
totalRead += int64(n) | |
remaining -= int64(n) | |
if err != nil && err != io.EOF { | |
// If all was read, skip error | |
if totalRead >= offset { | |
err = nil | |
} | |
return 0, err | |
} | |
if err == io.EOF { | |
break | |
} | |
return io.CopyN(io.Discard, cr, offset) |
It may be a tiny bit less efficient but the simplicity is worth it in my opinion.
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.
Currently, countingReader.Seek() uses io.ReadFull() to read data, so memory is allocated for all content of rpm file (and content has no meaning here because only offset of reader must be changed).
So while parsing header of big rpm file, a lot of
memory allocates.
Use reading by small chunks.