-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8266002: vmTestbase/nsk/jvmti/ClassPrepare/classprep001 should skip events for unexpected classes #3732
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
Conversation
👋 Welcome back amenkov! A progress list of the required criteria for merging this PR into |
@alexmenkov 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.
I don't see any mention in the CR of the test failing due to this issue. How was it discovered? How is the fix being verified?
@@ -62,6 +62,12 @@ static class_info classes[] = { | |||
{ "Lnsk/jvmti/ClassPrepare/classprep001$TestInterface;", EXP_STATUS, 2, 1, 0 }, | |||
{ "Lnsk/jvmti/ClassPrepare/classprep001$TestClass;", EXP_STATUS, 3, 2, 1 } | |||
}; | |||
// This classes are loaded on a different thread. |
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.
"These classes..."
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.
Fixed
@@ -266,24 +289,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { | |||
} | |||
|
|||
JNIEXPORT void JNICALL | |||
Java_nsk_jvmti_ClassPrepare_classprep001_getReady(JNIEnv *env, jclass cls) { | |||
Java_nsk_jvmti_ClassPrepare_classprep001_getReady(JNIEnv *env, jclass cls, jthread thread) { |
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.
It's not clear to me why you now pass in the thread instead of calling GetCurrentThread, when the thread passed in is still always the current thread. Same thing for the check()
method.
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.
I think it makes the code more flexible and easier to extend
I discovered it researching JCK failure on a platform with UsageTracker enabled. I ensured the fix works during development when created otherTread before getReady and had printdump on. |
Mailing list message from David Holmes on serviceability-dev: On 29/04/2021 5:21 am, Alex Menkov wrote:
otherTread -> otherThread ? Cheers, |
fixed |
@alexmenkov 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 239 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 |
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.
Hi Alex,
The fix looks good to me. The logics is more clear now.
Thanks,
Serguei
/integrate |
@alexmenkov Since your change was applied there have been 273 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit 0ca86da. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Class loading may cause loading of some other system/internal classes (for example loading of java.util.concurrent classes when an other thread loads some classes concurrently).
The fix updates ClassPrepare test so it skip events for "unexpected" classes.
Also it adds a testcase to verify that classes which are explicitly loaded on other thread do not generate ClassPrepare event on the test thread.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3732/head:pull/3732
$ git checkout pull/3732
Update a local copy of the PR:
$ git checkout pull/3732
$ git pull https://git.openjdk.java.net/jdk pull/3732/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3732
View PR using the GUI difftool:
$ git pr show -t 3732
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3732.diff