Fix memory leak with named instantiator #8153
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
This commit reworks the named object instantiator so that it doesn't leak memory, by locating the cache on the `VisibleURLClassLoader` instance whenever possible. Previously, it retained strong references to classes, meaning that any class loaded via a script classloader would be strongly referenced and would prevent the loader from being collected. With this change, the cache is now located on the loader itself. If, for some reason, the loader is not a known classloader, we will still use a global cache, but this shouldn't leak memory anymore since in this case it's likely the affected classes come from Gradle core itself. Fixes #8142
melix
force-pushed
the
cc/dm/issue-8142
branch
from
5efc061
to
20c5114
Compare
oehme
suggested changes
Jan 3, 2019
| @@ -33,6 +36,28 @@ | |||
| } | |||
| } | |||
|
|
|||
| private final EnumMap<UserData, Object> userData = new EnumMap<UserData, Object>(UserData.class); | |||
There was a problem hiding this comment.
⭕️ I think an enummap + synchronized here is not any better than using a concurrent hash map. I'd go with the latter, so we don't need to keep an enum of keys here, giving us better separation of concerns.
There was a problem hiding this comment.
The EnumMap has the main advantage of having descriptive keys and optimized lookup/size. Also a ConcurrentMap will not prevent the same value from being computed concurrently, which we want to avoid (or we could have race conditions and linkage errors).
|
|
||
| private LoadingCache<Class<?>, LoadingCache<String, Object>> newValuesCache() { | ||
| return CacheBuilder.newBuilder() | ||
| .weakKeys() |
There was a problem hiding this comment.
❌ Weak keys aren't necessary here (and won't help either)
There was a problem hiding this comment.
Indeed, leftover of previous implementation.
This is unnecessary at this point.
oehme
approved these changes
Jan 3, 2019
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.
Context
See #8142