[GR-38674] Fix JFR-related UnsatisfiedLinkErrors. #11203
+211
−70
Conversation
This file contains hidden or 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
oracle-contributor-agreement
bot
added
the
OCA Verified
There was a problem hiding this comment.
Is the main change here recomputing JVMSupport.notAvailable so that the JDK-level JFR code knows that JFR is not supported? Then, in case JFR calls to the VM are somehow still made, you've kept the substitutions and now throw a descriptive error instead of UnsatisfiedLinkError?
| @@ -169,6 +191,9 @@ public static void setMiscellaneous(long eventTypeId, long value) { | |||
| /** See {@link JVM#getThreadId}. */ | |||
| @Substitute | |||
| public static long getThreadId(Thread t) { | |||
| if (!HasJfrSupport.get()) { | |||
| throw jfrNotSupportedException(); | |||
| } | |||
| return SubstrateJVM.getThreadId(t); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Why are methods like Target_jdk_jfr_internal_JVM#getAllEventClasses() and Target_jdk_jfr_internal_JVM#getTicksFrequency() not guarded by HasJfrSupport.get()? Will this make JFR-related classes reachable even though users won't actually be able to use JFR?
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.
By default, JFR support is disabled in Native Image. If any JFR functionality is accessed at run-time, Native Image throws a
java.lang.UnsatisfiedLinkErrorat the moment, e.g.:This PR fixes that by ensuring that certain JFR substitutions are used even if JFR support is disabled.