-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8355773: Some nsk/jdi tests can fetch ThreadReference from static field in the debuggee #24935
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 cjplummer! A progress list of the required criteria for merging this PR into |
|
@plummercj 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 75 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 |
|
@plummercj 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. |
|
|
||
| case 0: | ||
| ThreadReference thread = debuggee.threadByNameOrThrow(methodName); | ||
| ThreadReference thread = debuggee.mainThread(); |
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.
This is one that was missed during the PR for #24867.
| static final int lineForBreakInThread = 141; | ||
| static final int[] checkedLines = { 142, 142, 182 }; |
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.
Note the added lines in the debuggee below.
| static final int lineForBreakInThread = 149; | ||
| static final int[] checkedLines = { 163, 163, 196 }; | ||
| static final int[] checkedLinesAlt = { 164, 164, 196 }; |
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.
Note the added lines in the debuggee below.
sspitsyn
left a comment
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.
Looks good.
|
Thank you for the review Alex and Serguei! /integrate |
|
Going to push as commit 50145bb.
Your commit was automatically rebased without conflicts. |
|
@plummercj Pushed as commit 50145bb. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
In an effort go get rid of calls to Debugee.threadByName() or Debugee.threadByNameOrThrow(), I found that many tests store the thread being looked up in a static field of the debuggee. The test can fetch the ThreadReference from the static field instead of looking it up using APIs that rely on vm.allThreads().
Most of the changes take advantage of the following common pattern:
In the debugger:
In the debuggee:
Note that the static field name for the Thread is the same as the thread name. Thus we can easily switch from looking up by thread name to instead looking up by static field name since they both use the same name.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24935/head:pull/24935$ git checkout pull/24935Update a local copy of the PR:
$ git checkout pull/24935$ git pull https://git.openjdk.org/jdk.git pull/24935/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24935View PR using the GUI difftool:
$ git pr show -t 24935Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24935.diff
Using Webrev
Link to Webrev Comment