Skip to content
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

Fix excessive memory use in inspect_linkages_lief #5348

Merged
merged 4 commits into from
May 22, 2024

Conversation

mbargull
Copy link
Member

@mbargull mbargull commented May 21, 2024

Description

introduced in gh-5228 which replaced binary.name with str(file).
The former returns the path to the binary whereas the latter returns the
contents of the parsed binary, naturally causing high memory usage.
That semantic change was unintended (misread upstream changes).
Since binary's path is no longer part of the object, pass it separately.

Fixes gh-5267

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

introduced in condagh-5228 which replaced binary.name with str(file).
The former returns the path to the binary whereas the latter returns the
contents of the parsed binary, naturally causing high memory usage.
That semantic change was unintended (misread upstream changes).
Since binary's path is no longer part of the object, pass it separately.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
to avoid variable shadowing.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 21, 2024
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull mbargull changed the base branch from main to 24.5.x May 21, 2024 08:51
@mbargull mbargull marked this pull request as ready for review May 21, 2024 08:51
@mbargull mbargull requested a review from a team as a code owner May 21, 2024 08:51
Copy link

codspeed-hq bot commented May 21, 2024

CodSpeed Performance Report

Merging #5348 will not alter performance

Comparing mbargull:lief-0.14-compat-fix (0483fde) with 24.5.x (fa90c11)

Summary

✅ 3 untouched benchmarks

@kenodegard
Copy link
Contributor

@beeankha @jezdez since this was originally a 24.3.x regression, how do y'all want to proceed with this?

@beeankha
Copy link
Contributor

@beeankha @jezdez since this was originally a 24.3.x regression, how do y'all want to proceed with this?

I'm currently out of office but if @jezdez is also on board, I can work on a patch release starting on Wednesday May 21st, especially if #5345 looks good to go and can also be included (otherwise I can do a separate patch release to include that change)

@kenodegard kenodegard added this to the 24.5.x milestone May 21, 2024
@kenodegard kenodegard merged commit 515aa8f into conda:24.5.x May 22, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Regression: CondaMemoryError when building
4 participants