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

8275035: Clean up worker thread infrastructure #5886

Closed
wants to merge 21 commits into from

Conversation

pliden
Copy link
Contributor

@pliden pliden commented Oct 11, 2021

I propose that we clean up our GangWorker/WorkGang and related classes, to remove abstractions we no longer need (after CMS was removed, MutexDispatcher was removed, Parallel is now using WorkGang, etc) and adjusting names as follows:

  • Rename AbstractGangTask to WorkerTask
  • Rename WorkGang to WorkerThreads
  • Fold GangWorker into WorkerThread
  • Fold WorkManager into WorkerThreads
  • Move SubTaskDone and friends to a new workerUtils.hpp/cpp

I've split things up into several commits to make it easier to review.

Testing: Passes Tier 1-3 on all Oracle platforms.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5886

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 11, 2021

👋 Welcome back pliden! 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
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

  • hotspot
  • serviceability
  • shenandoah

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 serviceability hotspot shenandoah labels Oct 11, 2021
@pliden pliden marked this pull request as ready for review Oct 11, 2021
@openjdk openjdk bot added the rfr label Oct 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 11, 2021

Webrevs

Copy link
Member

@stefank stefank left a comment

Looks good

@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

8275035: Clean up worker thread infrastructure

Reviewed-by: stefank, ayang

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 label Oct 11, 2021
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Changes to non GC files look fine.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

@pliden this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8275035_clean_up_worker_threads
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict and removed ready labels Oct 13, 2021
@openjdk openjdk bot added ready and removed merge-conflict labels Oct 14, 2021
@pliden
Copy link
Contributor Author

@pliden pliden commented Oct 14, 2021

Thanks all for reviewing!

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

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

  • 3b0b6ad: 8275226: Shenandoah: Relax memory constraint for worker claiming tasks/ranges
  • 8d9004b: 8274781: Use monospace font for enclosing interface
  • 333c469: 8275262: [BACKOUT] AArch64: Implement string_compare intrinsic in SVE

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 14, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

@pliden Pushed as commit 54b8870.

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

@pliden pliden deleted the 8275035_clean_up_worker_threads branch Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot integrated serviceability shenandoah
4 participants