Fix potential resource leak in AvoidStandbyModeService #3909
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
ripcurlx
previously approved these changes
Jan 20, 2020
There was a problem hiding this comment.
ACK - Tested it locally on Regtest. Toggling the avoid standy by feature (I can hear the sound behaving as before) everything works as before from a user perspective. Thanks for looking into this 👍
I just don't merge it immediately as I want to wait until #3889 gets merged so @cbeams doesn't need to do any unnecessary merges.
|
@stejbac Could you please resolve the conflict, caused by the recent gRPC PR merge? |
|
Afterwards I'm happy to merge your PR |
Replace tail recursion of the play() method with an ordinary loop, to prevent a new open JAR resource InputStream + sound file OutputStream (which were created every 4 minute playback) from accumulating on the stack, closing them inside the loop instead. (This also prevents eventual stack overflow.) Also tidy up FileUtil.resourceToFile and put the JAR URL InputStream in a try-with-resources block, to ensure that it doesn't leak either.
stejbac
force-pushed
the
fix-silent-sound-player-resource-leak
branch
from
d6d23cc
to
a073dbf
Compare
|
I've rebased onto master. (The conflict in |
ripcurlx
added
a:bug
is:priority
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.
Replace tail recursion of the
AvoidStandbyModeService.playmethod with an ordinary loop, to prevent a new open JAR resource InputStream + sound file OutputStream (which were created every 4 minute playback) from accumulating on the stack, closing them inside the loop instead. (This also prevents eventual stack overflow.)Also tidy up
FileUtil.resourceToFileand put the JAR URL InputStream in a try-with-resources block, to ensure that it doesn't leak either.--
Running lsof does reveal an accumulation of file handles without this fix, although not as many as one would expect from a new stream being opened every 4 minutes - perhaps they were being closed somehow in a finaliser?
Also, JProfiler revealed an accumulation of
ZipInputStreamobjects from loading the .aiff JAR resource.