Skip to content
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

8264372: Threads::destroy_vm only ever returns true #3535

Closed
wants to merge 2 commits into from

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Apr 16, 2021

Trivial cleanup to remove the bool return from Threads::destroy_vm as it only ever returned true.

Testing: tiers 1-3

Thanks,
David


Progress

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

Issue

  • JDK-8264372: Threads::destroy_vm only ever returns true

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3535

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 16, 2021

👋 Welcome back dholmes! 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 label Apr 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2021

@dholmes-ora 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 label Apr 16, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 16, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

Looks good to me.

return res;
}
Threads::destroy_vm();
// Should not change thread state, VM is gone
Copy link
Contributor

@shipilev shipilev Apr 16, 2021

Choose a reason for hiding this comment

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

It looks like this comment is there to match the removed ThreadStateTransition::transition(thread, _thread_in_vm, _thread_in_native);? In other words, it looks unnecessary.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2021

@dholmes-ora 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:

8264372: Threads::destroy_vm only ever returns true

Reviewed-by: shade, dcubed

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 28 new commits pushed to the master branch:

  • 73d5f3b: 8265313: Obsolete the unused AssertOnSuspendWaitFailure and TraceSuspendWaitFailures flags
  • cb8394a: 8265304: Temporarily make Metal the default 2D rendering pipeline for macOS
  • 66f8987: 8265298: Hard VM crash when deadlock between "access" and higher ranked lock is detected
  • 926e3bc: 8264143: Lanai: RenderPerfTest.BgrSwBlitImage has artefacts on apple M1
  • ff49970: 8265375: Bootcycle builds fail with StackOverflowError in cldrconverter
  • c108e7a: 8265154: vinserti128 operand mix up for KNL platforms
  • 2c4075c: 8265381: ProblemList runtime/logging/RedefineClasses.java on macos-x64 -Xcomp
  • 888d80b: 8265358: ProblemList jdk/jshell/ToolBasicTest.java on macOS-aarch64
  • 0bdc3e7: 8262744: Formatter '%g' conversion uses wrong format for BigDecimal rounding up to limits
  • 4413dbf: 8263395: Incorrect use of Objects.nonNull
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/3423f3e1f5a2120e8f761a238c2929c44957760d...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 label Apr 16, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 16, 2021

Mailing list message from David Holmes on hotspot-dev:

On 16/04/2021 5:25 pm, Aleksey Shipilev wrote:

On Fri, 16 Apr 2021 06:12:39 GMT, David Holmes <dholmes at openjdk.org> wrote:

Trivial cleanup to remove the bool return from Threads::destroy_vm as it only ever returned true.

Testing: tiers 1-3

Thanks,
David

Looks good to me.

Thanks for looking at this Aleksey!

src/hotspot/share/prims/jni.cpp line 3735:

3733: ThreadStateTransition::transition_from_native(thread, _thread_in_vm);
3734: Threads::destroy_vm();
3735: // Should not change thread state, VM is gone

It looks like this comment is there to match the removed `ThreadStateTransition::transition(thread, _thread_in_vm, _thread_in_native);`? In other words, it looks unnecessary.

Right - I will remove. I was reading it as "Don't bother changing state
any more, VM is gone".

David

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Thumbs up!

// Don't bother changing state any more, VM is gone.

would be a better comment.

@dholmes-ora
Copy link
Member Author

@dholmes-ora dholmes-ora commented Apr 18, 2021

Thanks @dcubed-ojdk and @shipilev , I adjusted the comment to read:

// Don't bother restoring thread state, VM is gone.

Integrating now.

@dholmes-ora
Copy link
Member Author

@dholmes-ora dholmes-ora commented Apr 18, 2021

/integrate

@openjdk openjdk bot closed this Apr 18, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 18, 2021

@dholmes-ora Since your change was applied there have been 28 commits pushed to the master branch:

  • 73d5f3b: 8265313: Obsolete the unused AssertOnSuspendWaitFailure and TraceSuspendWaitFailures flags
  • cb8394a: 8265304: Temporarily make Metal the default 2D rendering pipeline for macOS
  • 66f8987: 8265298: Hard VM crash when deadlock between "access" and higher ranked lock is detected
  • 926e3bc: 8264143: Lanai: RenderPerfTest.BgrSwBlitImage has artefacts on apple M1
  • ff49970: 8265375: Bootcycle builds fail with StackOverflowError in cldrconverter
  • c108e7a: 8265154: vinserti128 operand mix up for KNL platforms
  • 2c4075c: 8265381: ProblemList runtime/logging/RedefineClasses.java on macos-x64 -Xcomp
  • 888d80b: 8265358: ProblemList jdk/jshell/ToolBasicTest.java on macOS-aarch64
  • 0bdc3e7: 8262744: Formatter '%g' conversion uses wrong format for BigDecimal rounding up to limits
  • 4413dbf: 8263395: Incorrect use of Objects.nonNull
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/3423f3e1f5a2120e8f761a238c2929c44957760d...master

Your commit was automatically rebased without conflicts.

Pushed as commit 1ac25b8.

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

@dholmes-ora dholmes-ora deleted the 8264372 branch Apr 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot integrated
3 participants