Skip to content

Conversation

@plevart
Copy link
Contributor

@plevart plevart commented Aug 4, 2022

This is an attempt to fix inconsistent behavior of TerminatingThreadLocal(s) when used internally in JDK for per-carrier-thread caches of native ByteBuffer(s) and NativeBuffer(s). If used from virtual thread, such TerminatingThreadLocal(s) are not registered with the carrier thread for the cleanup.
The fix introduces an internal CarrierThreadLocal subclass of ThreadLocal which rewires its API methods to use current thread's carrier thread as the source of ThreadLocalMap instead of current thread itself (if it is a VirtualThread for example). TerminatingThreadLocal is now a subclass of CarrierThreadLocal. It seems only per-carrier-thread caching is a usecase for it. The uses of JavaLangAccess in various places to access a carrier-thread value of given ThreadLocal has been replaced by public API calls and the use of CarrierThreadLocal instead of plain ThreadLocal. JavaLangAccess is still used to dispatch the CarrierThreadLocal API methods, but only for that. Would someone be tempted to use JavaLangAccess methods directly, they now require CarrierThreadLocal argument to guard against missuses.
The REGISTRY of TerminatingThreadLocal(s) that tracks which of them have values bound to a particular carrier thread is now implemented conveniently with a CarrierThreadLocal.
The test is expanded with a case that demonstrates a situation where a carrier thread is terminated. Since it must wait for 30 seconds for that to happen, only one of the test cases is performed in this mode. The correct logic of TerminatingThreadLocal is still verified with all test-cases using platform threads that can be terminated more rapidly.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8291897: TerminatingThreadLocal(s) not registered from virtual thread(s)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9743/head:pull/9743
$ git checkout pull/9743

Update a local copy of the PR:
$ git checkout pull/9743
$ git pull https://git.openjdk.org/jdk pull/9743/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9743

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9743.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2022

👋 Welcome back plevart! 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 Aug 4, 2022
@openjdk
Copy link

openjdk bot commented Aug 4, 2022

@plevart The following labels will be automatically applied to this pull request:

  • core-libs
  • nio
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org nio nio-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Aug 4, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 4, 2022

Webrevs

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

I did a quick pass over this and it looks good. Adding CarrierThreadLocal is a good idea and as it allows the use-sites to be revert/cleaned up. Just a few minor comments so far.

@openjdk
Copy link

openjdk bot commented Aug 8, 2022

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

8291897: TerminatingThreadLocal(s) not registered from virtual thread(s)

Reviewed-by: alanb

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

  • 20123ea: 8291901: IGV: Preference menu disappears after JDK-8288750
  • 8e2c006: 8291957: Redundant import statements in sun.security.ec
  • ae52053: 8291954: Use Optional.isEmpty instead of !Optional.isPresent in java.base
  • 87cda21: Merge
  • 5963300: 8290562: ThreadMXBean.getThread{Cpu,User}Time fails with -XX:-VMContinuations
  • 0657acf: 8289249: Add methods to Elements for record constructors
  • b66a0d1: 8291992: [REDO2] ProblemList multiple tests in -Xcomp mode due to JDK-8291649
  • 9bff3b7: 8291990: [REDO] ProblemList multiple tests in -Xcomp mode due to JDK-8291649
  • f9bb367: 8291653: G1 refinement incorrectly expects always-valid HeapRegion out of the Hot Card Cache
  • b17a745: 8291637: HttpClient default keep alive timeout not followed if server sends invalid value
  • ... and 31 more: https://git.openjdk.org/jdk/compare/1a6c83b7718e00cf2284903434766dc6d4bf7755...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 Pull request is ready to be integrated label Aug 8, 2022
@plevart
Copy link
Contributor Author

plevart commented Aug 8, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2022

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

  • 8d88be2: 8291459: JVM crash with GenerateOopMap::error_work(char const*, __va_list_tag*)
  • 8a804f6: 8291454: Missing check for JLI C runtime library in CoreLibraries.gmk
  • 5a539e8: 8291893: riscv: remove fence.i used in user space
  • b2f0cbd: 8064787: [macosx] In Nimbus LaF, Ctrl+Alt mnemonic doesn't work
  • 891df21: 8259687: JTabbedPane.setComponentAt doesn't hide previously visible tab component
  • d4fb91b: 8291956: Simplify the loop condition in sun.net.httpserver.Request constructor
  • 20123ea: 8291901: IGV: Preference menu disappears after JDK-8288750
  • 8e2c006: 8291957: Redundant import statements in sun.security.ec
  • ae52053: 8291954: Use Optional.isEmpty instead of !Optional.isPresent in java.base
  • 87cda21: Merge
  • ... and 37 more: https://git.openjdk.org/jdk/compare/1a6c83b7718e00cf2284903434766dc6d4bf7755...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 8, 2022

@plevart Pushed as commit 861cc67.

💡 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

core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated nio nio-dev@openjdk.org security security-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

2 participants