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

8319897: Move StackWatermark handling out of LockStack::contains #9

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 13, 2023

Transplanted from openjdk/jdk21u#420

Clean backport to improve Lightweight Locking reliability. The patch only affects the LW paths, which are disabled by default.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8319897 needs maintainer approval

Issue

  • JDK-8319897: Move StackWatermark handling out of LockStack::contains (Enhancement - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/9/head:pull/9
$ git checkout pull/9

Update a local copy of the PR:
$ git checkout pull/9
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/9/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/9.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 13, 2023

👋 Welcome back shade! 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 changed the title Backport bbf52e0e4cb76b4c6425e7d1266dcdbb4df556ea 8319897: Move StackWatermark handling out of LockStack::contains Dec 13, 2023
@openjdk
Copy link

openjdk bot commented Dec 13, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval rfr Pull request is ready for review labels Dec 13, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 13, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

@shipilev 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:

8319897: Move StackWatermark handling out of LockStack::contains

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

  • 63aecc5: 8320300: Adjust hs_err output in malloc/mmap error cases
  • e8cf56c: 8320798: Console read line with zero out should zero out underlying buffer
  • d65289d: 8313082: Enable CreateCoredumpOnCrash for testing in makefiles
  • 901048b: 8315680: java/lang/ref/ReachabilityFenceTest.java should run with -Xbatch
  • 0106db0: 8320807: [PPC64][ZGC] C1 generates wrong code for atomics
  • 0e0e897: 8320898: exclude compiler/vectorapi/reshape/TestVectorReinterpret.java on ppc64(le) platforms
  • fb34573: 8321894: Bump update version for OpenJDK: 21.0.3

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 ready Pull request is ready to be integrated and removed approval labels Dec 15, 2023
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 19, 2023

Going to push as commit f55a91a.
Since your change was applied there have been 29 commits pushed to the master branch:

  • b8a0d9f: 8316229: Enhance class initialization logging
  • 5d32860: 8310807: java/nio/channels/DatagramChannel/Connect.java timed out
  • 0c92460: 8309302: java/net/Socket/Timeouts.java fails with AssertionError on test temporal post condition
  • 6644066: 8313621: test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal should use RandomFactory
  • 80b5f72: 8263256: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails due to dynamic reconfigurations of network interface during test
  • ee7748a: 8317300: javac erroneously allows "final" in front of a record pattern
  • d50fd26: 8314990: Generational ZGC: Strong OopStorage stats reported as weak roots
  • c3b0c03: 8319668: Fixup of jar filename typo in BadFactoryTest.sh
  • 2062596: 8320208: Update Public Suffix List to b5bf572
  • 16554ae: 8316392: compiler/interpreter/TestVerifyStackAfterDeopt.java failed with SIGBUS in PcDescContainer::find_pc_desc_internal
  • ... and 19 more: https://git.openjdk.org/jdk21u-dev/compare/ba79073da5baede8d381cd495fb82379b6775f09...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 19, 2023
@openjdk openjdk bot closed this Dec 19, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 19, 2023
@openjdk
Copy link

openjdk bot commented Dec 19, 2023

@shipilev Pushed as commit f55a91a.

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

@shipilev shipilev deleted the JDK-8319897-sw-lockstack branch February 7, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant