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

8324513: Inline ContiguousSpace::object_iterate_from #17531

Closed
wants to merge 2 commits into from

Conversation

albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented Jan 23, 2024

Trivial refactoring of inlining a method.


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-8324513: Inline ContiguousSpace::object_iterate_from (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17531

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 23, 2024

👋 Welcome back ayang! 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 8324513 8324513: Inline ContiguousSpace::object_iterate_from Jan 23, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

  • hotspot-gc

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.

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Jan 23, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 23, 2024

Webrevs

Comment on lines 148 to 156
void ContiguousSpace::object_iterate(ObjectClosure* blk) {
if (is_empty()) return;
object_iterate_from(bottom(), blk);
}

void ContiguousSpace::object_iterate_from(HeapWord* mark, ObjectClosure* blk) {
while (mark < top()) {
blk->do_object(cast_to_oop(mark));
mark += cast_to_oop(mark)->size();
HeapWord* addr = bottom();
while (addr < top()) {
oop obj = cast_to_oop(addr);
blk->do_object(obj);
addr += obj->size();
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Given that this function now grows beyond a small two-liner implementation, I would prefer if the is_emptycheck was separated from the rest of the code. Something like this:

void ContiguousSpace::object_iterate(ObjectClosure* blk) {
  if (is_empty()) {
    return;
  }
  
  HeapWord* addr = bottom();
  while (addr < top()) {
    oop obj = cast_to_oop(addr);
    blk->do_object(obj);
    addr += obj->size();
  }
}

With that said, it seems like the is_empty() boils down to a comparison between bottom() and top(). If that is the case, then we could just remove the is_empty() check and let that be handled by the while loop.

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

8324513: Inline ContiguousSpace::object_iterate_from

Reviewed-by: stefank

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

  • fbaaac6: 8314164: java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java fails intermittently in timeout
  • 791b427: 8323640: [TESTBUG]testMemoryFailCount in jdk/internal/platform/docker/TestDockerMemoryMetrics.java always fail because OOM killed
  • bcaad51: 8318228: RISC-V: C2 ConvF2HF

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 Jan 23, 2024
@albertnetymk
Copy link
Member Author

Thanks for review.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

  • fbaaac6: 8314164: java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java fails intermittently in timeout
  • 791b427: 8323640: [TESTBUG]testMemoryFailCount in jdk/internal/platform/docker/TestDockerMemoryMetrics.java always fail because OOM killed
  • bcaad51: 8318228: RISC-V: C2 ConvF2HF

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 23, 2024

@albertnetymk Pushed as commit 2a01c79.

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

@albertnetymk albertnetymk deleted the trivial branch January 23, 2024 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants