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.

Sign up for GitHub

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

Jump to bottom

8292448: Convert BitMapFragmentTable to ResourceHashtable #9893

Closed
wants to merge 3 commits into from
Closed

8292448: Convert BitMapFragmentTable to ResourceHashtable #9893

wants to merge 3 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Aug 16, 2022 •
edited by openjdk bot
Loading

This is an uncomplicated conversion of the bitmap fragment table into a ResizeableResourceHashtable. Ran tiers 1-3 and 4-7 with other changes, and verified that the memory for ResourceHashtableStorage is freed.

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-8292448: Convert BitMapFragmentTable to ResourceHashtable

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9893

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 16, 2022

👋 Welcome back coleenp! 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 16, 2022
@openjdk
Copy link

openjdk bot commented Aug 16, 2022

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

  • hotspot

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 hotspot-dev@openjdk.org label Aug 16, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 16, 2022 •
edited
Loading

Webrevs

iklam
iklam reviewed Aug 16, 2022
View reviewed changes
Copy link
Member

@iklam iklam 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, but I think the explicit delete is not necessary.

src/hotspot/share/utilities/objectBitSet.inline.hpp Outdated
return NULL;
};
Deleter deleter;
_bitmap_fragments.unlink(&deleter);
Copy link
Member

Choose a reason for hiding this comment

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

This shouldn't be necessary. The destructor of _bitmap_fragments will be implicitly called and will free all of its entries.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I added a temporary assert and indeed it is. Thanks for pointing this out.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd actually tested with the version without it and then thought I needed it this morning, so I'm glad I don't need it.

iklam
iklam approved these changes Aug 16, 2022
View reviewed changes
Copy link
Member

@iklam iklam 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. A lot of lines removed!

@openjdk
Copy link

openjdk bot commented Aug 16, 2022 •
edited
Loading

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

8292448: Convert BitMapFragmentTable to ResourceHashtable

Reviewed-by: iklam, rehn

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

  • f75da22: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
  • 802ef38: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
  • e61f6fc: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
  • 0bfb121: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
  • 1d9c2f7: 8292279: (fs) Use try-with-resources to release NativeBuffer
  • a25e1dc: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
  • 1ef4e48: 8273860: Javadoc Deprecated API list should not use italic font for description column
  • 0cc66ae: 8285790: AArch64: Merge C2 NEON and SVE matching rules
  • da477b1: 8292509: ProblemList java/lang/invoke/lambda/LogGeneratedClassesTest.java on windows
  • 01b87ba: 8289616: Drop use of Thread.stop in AppContext
  • ... and 7 more: https://git.openjdk.org/jdk/compare/6e6ae596d6bd73909b90911e01fbd0c16f6335e1...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 16, 2022
robehn
robehn approved these changes Aug 17, 2022
View reviewed changes
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Thanks!

@coleenp
Copy link
Contributor Author

coleenp commented Aug 17, 2022

Thanks for the reviews, Ioi and Robbin!
/integrate

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

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

  • f75da22: 8292395: [testbug] VectorGatherScatterTest.java fails on SVE with -XX:MaxVectorSize=8 after JDK-8288397
  • 802ef38: 8292327: java.io.EOFException in InflaterInputStream after JDK-8281962
  • e61f6fc: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
  • 0bfb121: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
  • 1d9c2f7: 8292279: (fs) Use try-with-resources to release NativeBuffer
  • a25e1dc: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
  • 1ef4e48: 8273860: Javadoc Deprecated API list should not use italic font for description column
  • 0cc66ae: 8285790: AArch64: Merge C2 NEON and SVE matching rules
  • da477b1: 8292509: ProblemList java/lang/invoke/lambda/LogGeneratedClassesTest.java on windows
  • 01b87ba: 8289616: Drop use of Thread.stop in AppContext
  • ... and 7 more: https://git.openjdk.org/jdk/compare/6e6ae596d6bd73909b90911e01fbd0c16f6335e1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 17, 2022

@coleenp Pushed as commit e230719.

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

@coleenp coleenp deleted the object-bit-table branch August 17, 2022 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robehn robehn robehn approved these changes

@iklam iklam iklam approved these changes

Assignees
No one assigned
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@coleenp @robehn @iklam