Fix #4953: Resource leak when using --animate #4954
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
Create the OffscreenView only once when animating
|
I think the root cause is due to OffscreenView not being destructed appropriately? In theory it should close everything when dropped, and will not cause resource leakage (but it may be slow). |
|
Either way, allocating it only once works well and it's more efficient that
way.
…On Sun, Jan 28, 2024, 22:11 pca006132 ***@***.***> wrote:
I think the root cause is due to OffscreenView not being destructed
appropriately? In theory it should close everything when dropped, and will
not cause resource leakage (but it may be slow).
—
Reply to this email directly, view it on GitHub
<#4954 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAIIZ5OGCHAELUJTRJTXT6LYQ4OP7AVCNFSM6AAAAABCOSV7LOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSMJTHEZDQOBQHA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
True. Maybe we can use a singleton instead of passing OffscreenView around? |
kintel
reviewed
Feb 4, 2024
|
|
||
| bool prepare_preview(Tree& tree, const ViewOptions& options, Camera& camera, OffscreenView& glview) | ||
| { | ||
| PRINTD("prepare_preview_common"); |
There was a problem hiding this comment.
This was an old typo: -> PRINTD("prepare_preview");
| try { | ||
| glview = std::make_unique<OffscreenView>(camera.pixel_width, camera.pixel_height); | ||
| glview = std::make_shared<OffscreenView>(camera.pixel_width, camera.pixel_height); |
There was a problem hiding this comment.
Why switch to shared_ptr when we're still maintaining a unique instance?
| @@ -446,6 +446,13 @@ int cmdline(const CommandLine& cmd) | |||
| render_variables.time = 0; | |||
| return do_export(cmd, render_variables, export_format, root_file); | |||
| } else { | |||
| std::shared_ptr<OffscreenView> glview = nullptr; | |||
| @@ -446,6 +446,13 @@ int cmdline(const CommandLine& cmd) | |||
| render_variables.time = 0; | |||
| return do_export(cmd, render_variables, export_format, root_file); | |||
| } else { | |||
| std::shared_ptr<OffscreenView> glview = nullptr; | |||
| if ((export_format == FileFormat::ECHO || export_format == FileFormat::PNG) && (cmd.viewOptions.renderer == RenderType::OPENCSG || cmd.viewOptions.renderer == RenderType::THROWNTOGETHER)) { | |||
| Camera camera = cmd.camera; | |||
There was a problem hiding this comment.
This looks a bit dubious: You're copying the camera, then passing the copy into create_offscreenview() which potentially modifies the camera, then passing the original camera to do_export() later.
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.
Create the OffscreenView only once when using --animate