8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls #4070

iklam · 2021-05-17T17:39:32Z

SystemDictionaryShared::should_be_excluded is called during CDS dump time to see if a class should be excluded from the archive. This function calls itself to check super types. As a result, some classes many be checked more than once.

The repeated calls slows down dumping. Also, If a class is excluded, we will see multiple warning messages like this, which is too verbose and confusing.

Skipping org/eclipse/osgi/util/NLS: Signed JAR
Skipping org/eclipse/osgi/util/NLS: Signed JAR
Skipping org/eclipse/osgi/util/NLS: Signed JAR

BTW, to make the code a little easier to read, I also changed

 warn_excluded(k, "Failed verification");
 return true;

to

return  warn_excluded(k, "Failed verification");

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls

Reviewers

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to b31408a
Coleen Phillimore (@coleenp - Reviewer) ⚠️ Review applies to f1e1e27

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4070/head:pull/4070
$ git checkout pull/4070

Update a local copy of the PR:
$ git checkout pull/4070
$ git pull https://git.openjdk.java.net/jdk pull/4070/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4070

View PR using the GUI difftool:
$ git pr show -t 4070

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4070.diff

…avoid-repeated-should_be_excluded

bridgekeeper · 2021-05-17T17:40:49Z

👋 Welcome back iklam! 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 · 2021-05-17T17:43:23Z

@iklam 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.

mlbridge · 2021-05-17T17:55:46Z

Webrevs

mlbridge · 2021-05-17T21:14:03Z

Mailing list message from Ioi Lam on hotspot-runtime-dev:

Correcting the title of the PR:

JDK-8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls

On 5/17/21 10:55 AM, Ioi Lam wrote:

dholmes-ora

Hi Ioi,

These changes seem fine.

A couple of nits below.

Thanks,
David

dholmes-ora · 2021-05-18T06:42:53Z

src/hotspot/share/classfile/systemDictionaryShared.cpp

+  if (k->is_hidden() && !is_registered_lambda_proxy_class(k)) {
    ResourceMark rm;
-    log_warning(cds)("Skipping %s: super class %s is excluded", k->name()->as_C_string(), super->name()->as_C_string());
+    log_debug(cds)("Skipping %s: %s", k->name()->as_C_string(), "Hidden class");


You don't need to feed "Hidden class" to a %s.

dholmes-ora · 2021-05-18T06:44:09Z

src/hotspot/share/classfile/systemDictionaryShared.cpp

+  if (super != NULL && check_for_exclusion(super, NULL)) {
    ResourceMark rm;
-    log_debug(cds)("Skipping %s: %s", k->name()->as_C_string(), "Hidden class");
+    log_warning(cds)("Skipping %s: super class %s is excluded @%p", k->name()->as_C_string(), super->name()->as_C_string(), super);


Pretty sure we still don't/can't use %p in shared code, but should be INTPTR_FORMAT and use p2i(super)

I reverted back to the original code and removed the %p. I added %p for temporary debugging only.

dholmes-ora · 2021-05-18T06:44:22Z

src/hotspot/share/classfile/systemDictionaryShared.cpp

-    if (should_be_excluded(intf)) {
-      log_warning(cds)("Skipping %s: interface %s is excluded", k->name()->as_C_string(), intf->name()->as_C_string());
+    if (check_for_exclusion(intf, NULL)) {
+      log_warning(cds)("Skipping %s: interface %s is excluded @%p", k->name()->as_C_string(), intf->name()->as_C_string(), intf);


Ditto on %p

openjdk · 2021-05-18T06:46:51Z

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

8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls

Reviewed-by: dholmes, coleenp

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

coleenp

Looks good!

dholmes-ora

LGTM.

iklam · 2021-05-19T19:30:05Z

Thanks @coleenp and @dholmes-ora for the review!
/integrate

openjdk · 2021-05-19T19:31:42Z

@iklam Since your change was applied there have been 26 commits pushed to the master branch:

74f30ad: 8263684: Avoid wrapping into BufferedWriter twice
9820f3d: 8267371: Concurrent gtests take too long
38d690b: 8265262: CITime - 'other' incorrectly calculated
66ab6d8: 8264181: javadoc tool Incorrect error message about malformed link
99fcc41: 8234532: Remove ThreadLocalAllocBuffer::_fast_refill_waste since it is never set
237fee8: 8267339: Temporarily disable os.release_multi_mappings_vm on macOS x64
64e2479: 8267407: ProblemList vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java on linux-aarch64
9760dba: 8267321: Use switch expression for VarHandle$AccessMode lookup
fdd0352: 8267338: [JVMCI] revive JVMCI API removed by JDK-8243287
0b49f5a: 8267257: Shenandoah: Always deduplicate strings when it is enabled during full gc
... and 16 more: https://git.openjdk.java.net/jdk/compare/ff84577d72226da0bf1ce2c6d6852f3934feecf2...master

Your commit was automatically rebased without conflicts.

Pushed as commit b961f25.

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

iklam added 3 commits May 14, 2021 15:52

8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls

88ab5f4

Merge branch 'master' of https://github.com/openjdk/jdk into 8267191-…

0f3c893

…avoid-repeated-should_be_excluded

fixed merge

f1e1e27

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label May 17, 2021

iklam marked this pull request as ready for review May 17, 2021 17:51

openjdk bot added the rfr Pull request is ready for review label May 17, 2021

iklam changed the title ~~8267191 avoid repeated should be excluded~~ 8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls May 17, 2021

dholmes-ora approved these changes May 18, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 18, 2021

coleenp approved these changes May 18, 2021

View reviewed changes

@dholmes-ora comments

b31408a

dholmes-ora approved these changes May 18, 2021

View reviewed changes

Merge branch 'master' into 8267191-avoid-repeated-should_be_excluded

de73c6c

openjdk bot closed this May 19, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 19, 2021

8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls #4070

8267191: Avoid repeated SystemDictionaryShared::should_be_excluded calls #4070

Uh oh!

Conversation

iklam commented May 17, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented May 17, 2021

Uh oh!

openjdk bot commented May 17, 2021

Uh oh!

mlbridge bot commented May 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

mlbridge bot commented May 17, 2021

Uh oh!

dholmes-ora left a comment

Choose a reason for hiding this comment

Uh oh!

dholmes-ora May 18, 2021

Choose a reason for hiding this comment

Uh oh!

iklam May 18, 2021

Choose a reason for hiding this comment

Uh oh!

dholmes-ora May 18, 2021

Choose a reason for hiding this comment

Uh oh!

iklam May 18, 2021

Choose a reason for hiding this comment

Uh oh!

dholmes-ora May 18, 2021

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented May 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coleenp left a comment

Choose a reason for hiding this comment

Uh oh!

dholmes-ora left a comment

Choose a reason for hiding this comment

Uh oh!

iklam commented May 19, 2021

Uh oh!

openjdk bot commented May 19, 2021

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

iklam commented May 17, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented May 17, 2021 •

edited

Loading

openjdk bot commented May 18, 2021 •

edited

Loading