Skip to content

8257700: Add logging for sealed classes in JVM_GetPermittedSubclasses #1780

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

Closed
wants to merge 3 commits into from

Conversation

hseigel
Copy link
Member

@hseigel hseigel commented Dec 15, 2020

Please review this small fix for JDK-8257700 to add logging to JVM_GetPermittedSubclasses(). The fix was tested with Mach5 tiers 1 and 2 on Linux, MacOS, and WIndows, tiers 3-5 on Linux x64, and by running the hotspot runtime sealed tests with -Xlog:class+sealed=trace and looking at the output.

Thanks, Harold


Progress

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

Issue

  • JDK-8257700: Add logging for sealed classes in JVM_GetPermittedSubclasses

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1780/head:pull/1780
$ git checkout pull/1780

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2020

👋 Welcome back hseigel! 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 openjdk bot added the rfr Pull request is ready for review label Dec 15, 2020
@openjdk
Copy link

openjdk bot commented Dec 15, 2020

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

  • hotspot

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 hotspot-dev@openjdk.org label Dec 15, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2020

Webrevs

Copy link
Member

@lfoltan lfoltan 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, one minor comment.
Lois

@@ -2160,6 +2176,7 @@ JVM_ENTRY(jobjectArray, JVM_GetPermittedSubclasses(JNIEnv* env, jclass current))
}
return (jobjectArray)JNIHandles::make_local(THREAD, result());
} else {
log_trace(class, sealed)("Type %s is not sealed", ik->external_name());
Copy link
Member

Choose a reason for hiding this comment

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

I would remove this line in favor of adding adding an indication of sealed or not sealed to line #2129. See my suggested change above.

@@ -2127,10 +2126,14 @@ JVM_ENTRY(jobjectArray, JVM_GetPermittedSubclasses(JNIEnv* env, jclass current))
Klass* c = java_lang_Class::as_Klass(mirror);
assert(c->is_instance_klass(), "must be");
InstanceKlass* ik = InstanceKlass::cast(c);
log_trace(class, sealed)("Calling GetPermittedSubclasses for type %s", ik->external_name());
Copy link
Member

Choose a reason for hiding this comment

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

Consider adding a sealed indication to this log_trace which would allow you to delete line #2179. Something like:
("Calling GetPermittedSubclasses for %s type %s", ik->external_name(), (ik->is_sealed() ? "sealed" : "non-sealed"))

@openjdk
Copy link

openjdk bot commented Dec 15, 2020

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

8257700: Add logging for sealed classes in JVM_GetPermittedSubclasses

Reviewed-by: lfoltan, coleenp, 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 16 new commits pushed to the master branch:

  • 6eca296: 8258420: Move URL configuration from Docs.gmk to conf dir
  • 3c66485: 8257906: JFR: RecordingStream leaks memory
  • 0c8cc2c: 8258058: improve description of OutOfMemoryError relevant flags
  • cdb5342: 8258252: Move PtrQueue enqueue to PtrQueueSet subclasses
  • 17ace83: 8258074: Move some flags related to compiler to compiler_globals.hpp
  • 47ba652: 8258455: problem list tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java
  • 1e77896: 8236225: Remove expired flags in JDK 17
  • 4d6f318: 8257726: Make -XX:+StressLdcRewrite option a diagnostic option
  • 8bf46c7: 8258438: build error in test/hotspot/gtest/runtime/test_os.cpp
  • 7977e38: 8254024: Enhance native libs for AWT and Swing to work with GraalVM Native Image
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/a372be4ba2216adb325f7616e54c1d58ac8fdf2a...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 ready Pull request is ready to be integrated label Dec 15, 2020
@hseigel
Copy link
Member Author

hseigel commented Dec 15, 2020

Please review this updated webrev. It contains the change suggested by Lois. Here's sample output from the added logging:

[0.355s][trace][class,sealed] Calling GetPermittedSubclasses for sealed type NoLoadSubclasses
[0.355s][trace][class,sealed] - sealed class has 2 permitted subclasses
[0.355s][trace][class,sealed] - [1] = ExistingClassFile
[0.355s][trace][class,sealed] - resolution of permitted subclass I/Dont/Exist/Either failed: java.lang.NoClassDefFoundError: I/Dont/Exist/Either
[0.355s][trace][class,sealed] - compacting array from length 2 to 1

Thanks, Harold

@lfoltan
Copy link
Member

lfoltan commented Dec 15, 2020

Looks good. Thanks for making the change I suggested!

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.

Hi Harold,
Looks good. One minor comment below.
Thanks,
David

@hseigel
Copy link
Member Author

hseigel commented Dec 16, 2020

Thanks Lois, Coleen, and David for reviewing this change. Please review the latest commit that adds the missing ResourceMark and removes the useless logging statement that David mentioned.
Thanks! Harold

Copy link
Contributor

@coleenp coleenp 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!

@hseigel
Copy link
Member Author

hseigel commented Dec 16, 2020

/integrate

@openjdk openjdk bot closed this Dec 16, 2020
@openjdk 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 Dec 16, 2020
@openjdk
Copy link

openjdk bot commented Dec 16, 2020

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

Your commit was automatically rebased without conflicts.

Pushed as commit 330ce86.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants