Skip to content

8307806: Rename Atomic::fetch_and_add and friends #13896

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

Closed
wants to merge 6 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented May 10, 2023

Please review this renaming of Atomic::fetch_and_add and friends to be
consistent with the naming convention recently chosen for atomic bitops. That
is, make the following name changes for class Atomic and it's implementation:

  • fetch_and_add => fetch_then_add
  • add_and_fetch => add_then_fetch

Testing:
mach5 tier1-3
GHA testing


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-8307806: Rename Atomic::fetch_and_add and friends

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13896

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 10, 2023

👋 Welcome back kbarrett! 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 bot commented May 10, 2023

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

  • hotspot
  • 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 hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels May 10, 2023
@kimbarrett kimbarrett marked this pull request as ready for review May 10, 2023 13:03
@openjdk openjdk bot added the rfr Pull request is ready for review label May 10, 2023
@mlbridge
Copy link

mlbridge bot commented May 10, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented May 10, 2023

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

8307806: Rename Atomic::fetch_and_add and friends

Reviewed-by: stefank, 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 7 new commits pushed to the master branch:

  • b6bcbc0: 8305770: os::Linux::available_memory() should refer MemAvailable in /proc/meminfo
  • e1e758a: 8305083: Remove finalize() from test/hotspot/jtreg/vmTestbase/nsk/share/ and /jpda that are used in serviceability/dcmd/framework tests
  • 1ce1611: 8307518: Remove G1 workaround in jstat about zero sized generation sizes
  • e32de7e: 8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
  • f3bd031: 8307891: ProblemList gtest/NMTGtest.java subtests on aix
  • 5f1f946: 8307520: set minimum supported CPU architecture to Power8 on AIX
  • ccb4dd6: 8307969: [zgc] Missing includes in gc/z/zTracer.cpp

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 May 10, 2023
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.

LGTM!

Thanks

@kimbarrett
Copy link
Author

I've merged after the genzgc integration (there were a couple of simple conflicts, where I took the new code but
applied the renaming to it). I then searched for and renamed some "new" occurrences of fetch_and_add (some
were in gc/x). So not a completely trivial merge. Reran mach5 tier1-3.
@stefank and @dholmes-ora - still okay?

Copy link
Member

@stefank stefank 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 don't think you need to wait for David's approval of the ZGC changes.

@kimbarrett
Copy link
Author

Thanks @stefank and @dholmes-ora for reviews.

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented May 12, 2023

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

  • b6bcbc0: 8305770: os::Linux::available_memory() should refer MemAvailable in /proc/meminfo
  • e1e758a: 8305083: Remove finalize() from test/hotspot/jtreg/vmTestbase/nsk/share/ and /jpda that are used in serviceability/dcmd/framework tests
  • 1ce1611: 8307518: Remove G1 workaround in jstat about zero sized generation sizes
  • e32de7e: 8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
  • f3bd031: 8307891: ProblemList gtest/NMTGtest.java subtests on aix
  • 5f1f946: 8307520: set minimum supported CPU architecture to Power8 on AIX
  • ccb4dd6: 8307969: [zgc] Missing includes in gc/z/zTracer.cpp

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 12, 2023

@kimbarrett Pushed as commit f09a0f5.

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

@kimbarrett kimbarrett deleted the atomic-arith-names branch May 12, 2023 09:52
Comment on lines 50 to 47
void install(ZForwarding* forwarding, volatile size_t* next) {
const size_t index = Atomic::fetch_then_add(next, 1u);
Copy link
Member

Choose a reason for hiding this comment

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

Why was this removed?

Copy link
Member

Choose a reason for hiding this comment

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

Never mind this seems to be a quirk of the github UI.

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

Successfully merging this pull request may close these issues.

3 participants