jdk
jdk copied to clipboard
openjdk
8332360: JVM hangs at exit when running on a uniprocessor
Restored the TryLock in the ReenterI (wait) case with a comment.
Tested with tier1-4.
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
Integration blocker
⚠️ Failed to retrieve information on issue 8332360. Please make sure it exists and is accessible.
Issue
- ⚠️ Failed to retrieve information on issue
8332360.
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19293/head:pull/19293
$ git checkout pull/19293
Update a local copy of the PR:
$ git checkout pull/19293
$ git pull https://git.openjdk.org/jdk.git pull/19293/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 19293
View PR using the GUI difftool:
$ git pr show -t 19293
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19293.diff
:wave: Welcome back coleenp! 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.
![bridgekeeper[bot] avatar](https://avatars.githubusercontent.com/u/41768318?v=4 "Published by a pub.dev verified publisher"){kind=small}
@coleenp 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:
8332360: JVM hangs at exit when running on a uniprocessor
Reviewed-by: dholmes, dcubed, shade
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 32 new commits pushed to the master branch:
- 3d511ff63e59f542ae20c722bfef1c867cd1da0e: 8329748: Change default value of AssertWXAtThreadSync to true
- 67f03f2a4f5ac12748ffbf5c04f248a60869e180: 8332533: RISC-V: Enable vector variable shift instructions for machines with RVV
- 5f804b2ec12627b593353ceeab881187b0bb5cd6: 8329825: Clarify the value type for java.net.SocketOptions.SO_LINGER
- 52eda79522a5bd71b527e5946b654a331b021473: 8332538: Switch off JIT memory limit check for TestAlignVectorFuzzer.java
- d999b81e7110751be402012e1ed41b3256f5895e: 8331572: Allow using OopMapCache outside of STW GC phases
- 8291c94bcdbb01beddc94f290f2749841404cc0c: 8331224: ClassCastException in ObjectInputStream hides ClassNotFoundException
- 42e3c842ae2684265c794868fc76eb0ff2dea3d9: 8332086: Remove the usage of ServiceLoader in j.u.r.RandomGeneratorFactory
- 5cf8288b8071bdcf0c923dd7ba36f91bc7594ef3: 8332153: RISC-V: enable tests and add comment for vector shift instruct (shared by vectorization and Vector API)
- ae9ad862ee54e119553efec919f1061dca36b954: 8331934: [s390x] Add support for primitive array C1 clone intrinsic
- 3479b46c5bea3afd92b6ab4acd2fe7f274df38aa: 8332595: Serial: Remove unused TenuredGeneration::should_collect
- ... and 22 more: https://git.openjdk.org/jdk/compare/44bdf9964eb2dd0eb4034576e1f903a27c410286...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.
@coleenp The following label will be automatically applied to this pull request:
hotspot-runtime
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.
I agree that hoisting the first TryLock out of the loop would be correct, but I can't wrap my head around the non-mt case. If the TryLock after the park fails, is it possible for the one before the next park could succeed. IE as if spin count = 2? Anyway, I prefer restoring the code as it was since there is a TrySpin there and it gives the chance to explain why the TryLock is also required, and there are other things going on in this code that I don't want to interfere with.
Going to push as commit 4f1a10f84bcfadef263a0890b6834ccd3d5bb52f.
Since your change was applied there have been 34 commits pushed to the master branch:
- c3bc23fe48ca1603afe68a6ac4aaa523a1edbb41: 8326306: RISC-V: Re-structure MASM calls and jumps
- 8a9d77d58de259b6b2bdc2cc9e7bfdc28dcf7165: 8320622: [TEST] Improve coverage of compiler/loopopts/superword/TestMulAddS2I.java on different platforms
- 3d511ff63e59f542ae20c722bfef1c867cd1da0e: 8329748: Change default value of AssertWXAtThreadSync to true
- 67f03f2a4f5ac12748ffbf5c04f248a60869e180: 8332533: RISC-V: Enable vector variable shift instructions for machines with RVV
- 5f804b2ec12627b593353ceeab881187b0bb5cd6: 8329825: Clarify the value type for java.net.SocketOptions.SO_LINGER
- 52eda79522a5bd71b527e5946b654a331b021473: 8332538: Switch off JIT memory limit check for TestAlignVectorFuzzer.java
- d999b81e7110751be402012e1ed41b3256f5895e: 8331572: Allow using OopMapCache outside of STW GC phases
- 8291c94bcdbb01beddc94f290f2749841404cc0c: 8331224: ClassCastException in ObjectInputStream hides ClassNotFoundException
- 42e3c842ae2684265c794868fc76eb0ff2dea3d9: 8332086: Remove the usage of ServiceLoader in j.u.r.RandomGeneratorFactory
- 5cf8288b8071bdcf0c923dd7ba36f91bc7594ef3: 8332153: RISC-V: enable tests and add comment for vector shift instruct (shared by vectorization and Vector API)
- ... and 24 more: https://git.openjdk.org/jdk/compare/44bdf9964eb2dd0eb4034576e1f903a27c410286...master
Your commit was automatically rebased without conflicts.
@coleenp Pushed as commit 4f1a10f84bcfadef263a0890b6834ccd3d5bb52f.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.