8344773: SM cleanup in ForkJoinPool #22324

DougLea · 2024-11-22T14:13:19Z

Complete the SM cleanup in java.util.concurrent that was deferred during other FJP updates

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-8344773: SM cleanup in ForkJoinPool (Bug - P4)

Reviewers

Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22324

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-11-22T14:14:08Z

👋 Welcome back dl! 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 · 2024-11-22T14:14:13Z

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

8344773: SM cleanup in ForkJoinPool

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:

6da3ecd: 8344960: RISC-V: fix TestFloatConversionsVectorNaN for COH and AlignVector
9291abc: 8342074: Fix runtime/Thread/TestAlwaysPreTouchStacks.java to be flagless or accept VM flags
0054bbe: 8343756: CAN_SHOW_REGISTERS_ON_ASSERT for Windows
3a625f3: 8344628: Test TestEnableJVMCIProduct.java run with virtual thread intermittent fails
25dd51e: 8344222: Remove calls to SecurityManager and doPrivileged in java.net.HttpURLConnection, java.net.HttpConnectSocketImpl, and javax.net.HttpsURLConnection after JEP 486 integration
9793e73: 8344853: Parallel: Improve comments in psParallelCompact
57d35f9: 8344382: RISC-V: CASandCAEwithNegExpected fails with Zacas
0105203: 8337660: C2: basic blocks with only BoxLock nodes are wrongly treated as empty
4e68d66: 8344954: Linker tests fails on BE platforms after JDK-8340205
ca81ab5: 8344994: Remove most uses of RuntimePermission checks in java.desktop
... and 31 more: https://git.openjdk.org/jdk/compare/a83cfe26583db078ecd754d9609111c0c6dac6a4...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 · 2024-11-22T14:15:04Z

@DougLea The following label will be automatically applied to this pull request:

core-libs

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.

mlbridge · 2024-11-22T14:17:45Z

Webrevs

AlanBateman · 2024-11-23T12:08:24Z

src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java

@@ -84,7 +80,7 @@ public class ForkJoinWorkerThread extends Thread {
        super.setDaemon(true);
        if (handler != null)
            super.setUncaughtExceptionHandler(handler);
-        if (useSystemClassLoader)
+        if (useSystemClassLoader & !clearThreadLocals) // else done by Thread ctor


It might be clearer to use a conditional-and here although it doesn't make any difference here.

I agree that "&&" would be clearer. Will do.

viktorklang-ora · 2024-11-25T10:23:36Z

src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java

+    /**
+     * Peforms any associated cleanup on resetThreadLocals
+     */
+    void onThreadLocalReset() {


@DougLea I'm wondering if it might be clearer if it was something like afterThreadLocalReset or postThreadLocalReset or something indicating that TLs have already expired by the point this is invoked.

How about just being clearer about this in javadoc: Changed to:
/**
* Performs any further cleanup after ThreadLocals are cleared in
* method resetThreadLocals
*/

AlanBateman

I think this looks good.

DougLea · 2024-11-26T11:44:11Z

/integrate

openjdk · 2024-11-26T11:44:33Z

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

6da3ecd: 8344960: RISC-V: fix TestFloatConversionsVectorNaN for COH and AlignVector
9291abc: 8342074: Fix runtime/Thread/TestAlwaysPreTouchStacks.java to be flagless or accept VM flags
0054bbe: 8343756: CAN_SHOW_REGISTERS_ON_ASSERT for Windows
3a625f3: 8344628: Test TestEnableJVMCIProduct.java run with virtual thread intermittent fails
25dd51e: 8344222: Remove calls to SecurityManager and doPrivileged in java.net.HttpURLConnection, java.net.HttpConnectSocketImpl, and javax.net.HttpsURLConnection after JEP 486 integration
9793e73: 8344853: Parallel: Improve comments in psParallelCompact
57d35f9: 8344382: RISC-V: CASandCAEwithNegExpected fails with Zacas
0105203: 8337660: C2: basic blocks with only BoxLock nodes are wrongly treated as empty
4e68d66: 8344954: Linker tests fails on BE platforms after JDK-8340205
ca81ab5: 8344994: Remove most uses of RuntimePermission checks in java.desktop
... and 31 more: https://git.openjdk.org/jdk/compare/a83cfe26583db078ecd754d9609111c0c6dac6a4...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-26T11:44:42Z

@DougLea Pushed as commit 3e509c8.

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

DougLea added 2 commits November 22, 2024 08:12

Remove SecurityManager-related code; refactor resetThreadLocals

5346c6a

Merge branch 'openjdk:master' into JDK-8344773

fb756fa

openjdk bot added the rfr Pull request is ready for review label Nov 22, 2024

openjdk bot added the core-libs [email protected] label Nov 22, 2024

AlanBateman reviewed Nov 23, 2024

View reviewed changes

DougLea added 2 commits November 24, 2024 13:29

Remove redundant doc comment; clarify condinional

9c69716

Merge branch 'openjdk:master' into JDK-8344773

12126ed

viktorklang-ora reviewed Nov 25, 2024

View reviewed changes

AlanBateman approved these changes Nov 25, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 25, 2024

Reinstate INITIAL_QUEUE_CAPACITY; clarify FJWT javadoc

2a58ea2

openjdk bot removed the ready Pull request is ready to be integrated label Nov 25, 2024

AlanBateman approved these changes Nov 26, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 26, 2024

openjdk bot added the integrated Pull request has been integrated label Nov 26, 2024

openjdk bot closed this Nov 26, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8344773: SM cleanup in ForkJoinPool #22324

8344773: SM cleanup in ForkJoinPool #22324

DougLea commented Nov 22, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 22, 2024

openjdk bot commented Nov 22, 2024 •

edited

Loading

openjdk bot commented Nov 22, 2024

mlbridge bot commented Nov 22, 2024 •

edited

Loading

AlanBateman Nov 23, 2024

DougLea Nov 24, 2024

viktorklang-ora Nov 25, 2024

DougLea Nov 25, 2024

AlanBateman left a comment

DougLea commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

8344773: SM cleanup in ForkJoinPool #22324

8344773: SM cleanup in ForkJoinPool #22324

Conversation

DougLea commented Nov 22, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 22, 2024

openjdk bot commented Nov 22, 2024 • edited Loading

openjdk bot commented Nov 22, 2024

mlbridge bot commented Nov 22, 2024 • edited Loading

Webrevs

AlanBateman Nov 23, 2024

Choose a reason for hiding this comment

DougLea Nov 24, 2024

Choose a reason for hiding this comment

viktorklang-ora Nov 25, 2024

Choose a reason for hiding this comment

DougLea Nov 25, 2024

Choose a reason for hiding this comment

AlanBateman left a comment

Choose a reason for hiding this comment

DougLea commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

openjdk bot commented Nov 26, 2024

DougLea commented Nov 22, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 22, 2024 •

edited

Loading

mlbridge bot commented Nov 22, 2024 •

edited

Loading