-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8345936: Call ClassLoader.getResourceAsByteArray only for multi-release jar #22696
8345936: Call ClassLoader.getResourceAsByteArray only for multi-release jar #22696
Conversation
👋 Welcome back ccheung! A progress list of the required criteria for merging this PR into |
@calvinccheung This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 108 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
@calvinccheung The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
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.
Looks good overall. I have one suggestion for simplification.
ClassLoaderExt::process_jar_manifest(current, entry); | ||
bool is_multi_release = ClassLoaderExt::process_jar_manifest(current, entry); | ||
if (is_multi_release) { | ||
entry->set_multi_release_jar(); |
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.
Maybe the set_multi_release_jar() call should be moved into process_jar_manifest()? That way, the logic doesn't need to be split in two places.
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.
That's a good idea. I've pushed an update.
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.
Seems reasonable.
Thanks
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.
LGTM
Thanks @iklam and @dholmes-ora for the review. /integrate |
Going to push as commit f647d4d.
Your commit was automatically rebased without conflicts. |
@calvinccheung Pushed as commit f647d4d. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This patch stores whether a jar is multi-release in the SharedClassPathEntry during CDS dump time.
At runtime, it only calls ClassLoader.getResourceAsByteArray if the jar is a multi-release jar.
As a result, the number of java calls is reduced.
Passed tiers 1, 3, 4 testing.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22696/head:pull/22696
$ git checkout pull/22696
Update a local copy of the PR:
$ git checkout pull/22696
$ git pull https://git.openjdk.org/jdk.git pull/22696/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 22696
View PR using the GUI difftool:
$ git pr show -t 22696
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22696.diff
Using Webrev
Link to Webrev Comment