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

8282360: Merge POSIX implementations of ThreadCritical #7622

Closed
wants to merge 1 commit into from

Conversation

hseigel
Copy link
Member

@hseigel hseigel commented Feb 25, 2022

Please review this small change to merge the Posix (aix, bsd, linux) implementations of ThreadCritical into a single file named src/hotspot/os/posix/threadCritical_posix.cpp. The change was tested by running Mach5 tiers 1-2 on Linux, Mac OS, and Windows, and Mach5 tiers 3-5 on Linux x64.

Thanks, Harold


Progress

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

Issue

  • JDK-8282360: Merge POSIX implementations of ThreadCritical

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7622

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

Using diff file

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 25, 2022

👋 Welcome back hseigel! 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 Pull request is ready for review label Feb 25, 2022
@openjdk
Copy link

openjdk bot commented Feb 25, 2022

@hseigel 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.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Feb 25, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 25, 2022

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Feb 25, 2022

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

8282360: Merge POSIX implementations of ThreadCritical

Reviewed-by: stuefe, coleenp, dholmes

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

  • cf6d256: 8282153: JFR: Check for recording waste
  • c5c6058: 8282219: jdk/java/lang/ProcessBuilder/Basic.java fails on AIX
  • fb8bf81: 8279995: jpackage --add-launcher option should allow overriding description
  • 441e485: 8281739: JFR: Use message with Objects.requireNonNull

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 the ready Pull request is ready to be integrated label Feb 25, 2022
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Nice!

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Harold,

The merge looks good.

The pre-existing use of PTHREAD_MUTEX_INITIALIZER is potentially problematic on FreeBSD - see comments in os_posix.cpp for mutexAttr. But that is a separate problem.

Thanks,
David

@hseigel
Copy link
Member Author

hseigel commented Feb 28, 2022

Thanks Thomas, Coleen, and David for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Feb 28, 2022

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

  • 06cadb3: 8230382: Clean up ConvI2L, CastII and CastLL::Ideal methods
  • efd3967: 8267265: Use new IR Test Framework to create tests for C2 Ideal transformations
  • 86723d4: 8281507: Two javac tests have bad jtreg @clean tags
  • 630ad1a: 8282428: ProblemList jdk/jfr/jvm/TestWaste.java
  • afd4bcb: 8282398: EndingDotHostname.java test fails because SSL cert expired
  • cf6d256: 8282153: JFR: Check for recording waste
  • c5c6058: 8282219: jdk/java/lang/ProcessBuilder/Basic.java fails on AIX
  • fb8bf81: 8279995: jpackage --add-launcher option should allow overriding description
  • 441e485: 8281739: JFR: Use message with Objects.requireNonNull

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 28, 2022

@hseigel Pushed as commit c58f5c6.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

4 participants