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

8345936: Call ClassLoader.getResourceAsByteArray only for multi-release jar #22696

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Dec 12, 2024

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8345936: Call ClassLoader.getResourceAsByteArray only for multi-release jar (Enhancement - P4)

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

@calvinccheung calvinccheung marked this pull request as ready for review December 12, 2024 00:10
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 12, 2024

👋 Welcome back ccheung! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@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:

8345936: Call ClassLoader.getResourceAsByteArray only for multi-release jar

Reviewed-by: iklam, dholmes

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 master branch:

  • cfa04d3: 8346051: MemoryTest fails when Shenandoah's generational mode is enabled
  • 2ce53e8: 8345970: pthread_getcpuclockid related crashes in shenandoah tests
  • 266e3d0: 8345590: AIX 'make all' fails after JDK-8339480
  • 1d2ccae: 8345569: [ubsan] adjustments to filemap.cpp and virtualspace.cpp for macOS aarch64
  • a9a5f7c: 8345323: Parallel GC does not handle UseLargePages and UseNUMA gracefully
  • 367c304: 8346059: [ASAN] awt_LoadLibrary.c reported compile warning ignoring return value of function by clang17
  • 31ceec7: 8346055: javax/swing/text/StyledEditorKit/4506788/bug4506788.java fails in ubuntu22.04
  • 09c29d1: 8346069: Add missing Classpath exception statements
  • 28e49e9: 8345505: Fix -Wzero-as-null-pointer-constant warnings in zero code
  • db9eab3: 8311542: Consolidate the native stack printing code
  • ... and 98 more: https://git.openjdk.org/jdk/compare/daa2ba52a3197924c34ccdd0c33703e61cdc8350...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 12, 2024
@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@calvinccheung The following label will be automatically applied to this pull request:

  • hotspot-runtime

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.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 12, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 12, 2024

Webrevs

Copy link
Member

@iklam iklam left a 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();
Copy link
Member

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.

Copy link
Member Author

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.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable.

Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 12, 2024
Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@calvinccheung
Copy link
Member Author

Thanks @iklam and @dholmes-ora for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 13, 2024

Going to push as commit f647d4d.
Since your change was applied there have been 108 commits pushed to the master branch:

  • cfa04d3: 8346051: MemoryTest fails when Shenandoah's generational mode is enabled
  • 2ce53e8: 8345970: pthread_getcpuclockid related crashes in shenandoah tests
  • 266e3d0: 8345590: AIX 'make all' fails after JDK-8339480
  • 1d2ccae: 8345569: [ubsan] adjustments to filemap.cpp and virtualspace.cpp for macOS aarch64
  • a9a5f7c: 8345323: Parallel GC does not handle UseLargePages and UseNUMA gracefully
  • 367c304: 8346059: [ASAN] awt_LoadLibrary.c reported compile warning ignoring return value of function by clang17
  • 31ceec7: 8346055: javax/swing/text/StyledEditorKit/4506788/bug4506788.java fails in ubuntu22.04
  • 09c29d1: 8346069: Add missing Classpath exception statements
  • 28e49e9: 8345505: Fix -Wzero-as-null-pointer-constant warnings in zero code
  • db9eab3: 8311542: Consolidate the native stack printing code
  • ... and 98 more: https://git.openjdk.org/jdk/compare/daa2ba52a3197924c34ccdd0c33703e61cdc8350...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 13, 2024
@openjdk openjdk bot closed this Dec 13, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 13, 2024
@openjdk
Copy link

openjdk bot commented Dec 13, 2024

@calvinccheung Pushed as commit f647d4d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@calvinccheung calvinccheung deleted the 8345936-getResourceAsByteArray branch December 13, 2024 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants