Skip to content

Conversation

@rnkovacs
Copy link
Contributor

@rnkovacs rnkovacs commented Aug 20, 2021

Not a clean backport. Original patch used a macro called THREAD_LOCAL, this backport uses THREAD_LOCAL_DECL. THREAD_LOCAL_DECL was renamed to THREAD_LOCAL by JDK-8230877 in JDK 14. Testing: tier1.

This is part of the Windows/AArch64 port.


Progress

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

Issue

  • JDK-8248666: AArch64: Use THREAD_LOCAL instead of __thread

Reviewers

Contributors

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/262/head:pull/262
$ git checkout pull/262

Update a local copy of the PR:
$ git checkout pull/262
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/262/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 262

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/262.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 20, 2021

👋 Welcome back rnkovacs! 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 2f8653fbf0f4ed2ab0e40b2bb541ef2eff913469 8248666: AArch64: Use THREAD_LOCAL instead of __thread Aug 20, 2021
@openjdk
Copy link

openjdk bot commented Aug 20, 2021

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Aug 20, 2021
@rnkovacs
Copy link
Contributor Author

/contributor add Bernhard Urban-Forster [email protected]

@openjdk
Copy link

openjdk bot commented Aug 20, 2021

@rnkovacs
Contributor Bernhard Urban-Forster <[email protected]> successfully added.

@rnkovacs rnkovacs marked this pull request as ready for review August 20, 2021 06:34
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 20, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 20, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 20, 2021

@rnkovacs This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8248666: AArch64: Use THREAD_LOCAL instead of __thread

__thread is gcc-ism, instead rely on compiler independent macro.

Co-authored-by: Bernhard Urban-Forster <[email protected]>
Reviewed-by: phh, clanger

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

  • c816276: 8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration
  • 910e24b: 8212718: Refactor some annotation processor tests to better use collections
  • 5792854: 8212695: Add explicit timeout to several HTTP Client tests
  • e5ec679: 8211325: test/jdk/java/net/Socket/LingerTest.java fails with cleaning up
  • 7100a65: 8169246: java/net/DatagramSocket/ReportSocketClosed.java fails intermittently with BindException
  • 069b4cc: 8199931: java/net/MulticastSocket/UnreferencedMulticastSockets.java fails with "incorrect data received"
  • 45ed9e8: 8263490: [macos] Crash occurs on JPasswordField with activated InputMethod
  • 7c872ed: 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
  • cb0775f: 8269934: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in java_lang_Thread::get_thread_status
  • 5d1b9bb: 8233790: Forward output from heap dumper to jcmd/jmap
  • ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/7cafcf4c34bef00fceb295f17877f88ff8c7e0bb...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee, @RealCLanger) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 20, 2021
@rnkovacs
Copy link
Contributor Author

Thank you, Paul!

@rnkovacs
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 20, 2021
@openjdk
Copy link

openjdk bot commented Aug 20, 2021

@rnkovacs
Your change (at version fa7d3a6) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

I can sponsor this one but it needs rebasing first.

@phohensee
Copy link
Member

There's an auto-generated comment above that says that rebasing wil be done automatically.

@RealCLanger
Copy link
Contributor

There's an auto-generated comment above that says that rebasing wil be done automatically.

Well, we can try... I'm not sure if this will work here as here seems to be a real conflict.

@rnkovacs rnkovacs force-pushed the 8248666-thread-local branch from fa7d3a6 to d666726 Compare August 25, 2021 15:57
@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Aug 25, 2021
@rnkovacs
Copy link
Contributor Author

I believe I solved the merge conflict. Thanks so much for pushing all the ready PRs in, I really appreciate it!

Copy link
Contributor

@RealCLanger RealCLanger 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. I think you can integrate it now.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 26, 2021

@phohensee The PR has been updated since the change author (@rnkovacs) issued the integrate command - the author must perform this command again.

@phohensee
Copy link
Member

Reka, please add a /integrate comment.

@rnkovacs
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 27, 2021
@openjdk
Copy link

openjdk bot commented Aug 27, 2021

@rnkovacs
Your change (at version d666726) is now ready to be sponsored by a Committer.

@rnkovacs
Copy link
Contributor Author

Sorry for the delay - thank you!

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 27, 2021

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

  • c816276: 8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration
  • 910e24b: 8212718: Refactor some annotation processor tests to better use collections
  • 5792854: 8212695: Add explicit timeout to several HTTP Client tests
  • e5ec679: 8211325: test/jdk/java/net/Socket/LingerTest.java fails with cleaning up
  • 7100a65: 8169246: java/net/DatagramSocket/ReportSocketClosed.java fails intermittently with BindException
  • 069b4cc: 8199931: java/net/MulticastSocket/UnreferencedMulticastSockets.java fails with "incorrect data received"
  • 45ed9e8: 8263490: [macos] Crash occurs on JPasswordField with activated InputMethod
  • 7c872ed: 8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon
  • cb0775f: 8269934: RunThese24H.java failed with EXCEPTION_ACCESS_VIOLATION in java_lang_Thread::get_thread_status
  • 5d1b9bb: 8233790: Forward output from heap dumper to jcmd/jmap
  • ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/7cafcf4c34bef00fceb295f17877f88ff8c7e0bb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 27, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 27, 2021
@openjdk
Copy link

openjdk bot commented Aug 27, 2021

@RealCLanger @rnkovacs Pushed as commit 9719270.

💡 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

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants