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

8261998: Remove unused shared entry support from utilities/hashtable #2638

Closed
wants to merge 2 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Feb 19, 2021

Please review this small cleanup in the utilities/hashtable facility. The
support for "shared" entries is no longer needed or used, so is being deleted.

Testing:
mach5 tier1-4 (some CDS tests are in tier4)


Progress

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

Issue

  • JDK-8261998: Remove unused shared entry support from utilities/hashtable

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2638/head:pull/2638
$ git checkout pull/2638

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 19, 2021

👋 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 openjdk bot added the rfr Pull request is ready for review label Feb 19, 2021
@openjdk
Copy link

openjdk bot commented Feb 19, 2021

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

  • hotspot
  • serviceability

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 serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Feb 19, 2021
@mlbridge
Copy link

mlbridge bot commented Feb 19, 2021

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

We might want to share other hashtables like this, like the loader constraint table, but I don't think this will be needed.

@@ -252,7 +252,7 @@ void JvmtiTagMapTable::rehash() {
p = entry->next_addr();
}
// get next entry
entry = (JvmtiTagMapEntry*)HashtableEntry<WeakHandle, mtServiceability>::make_ptr(*p);
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice to get rid of this. It would be nice if the hashtables didn't need to declare bucket() and bucket_addr() with all these casts but some template nonsense makes it not compile.

@openjdk
Copy link

openjdk bot commented Feb 19, 2021

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

8261998: Remove unused shared entry support from utilities/hashtable

Reviewed-by: coleenp, iklam

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 Pull request is ready to be integrated label Feb 19, 2021
@iklam
Copy link
Member

iklam commented Feb 19, 2021

We might want to share other hashtables like this, like the loader constraint table, but I don't think this will be needed.

CDS used to use Hashtable to store stuff into the archive. It doesn't do that anymore, and has switched to CompactHashtable. So the "shared entry" support in Hashtable can be safely deleted.

@kimbarrett
Copy link
Author

Thanks @coleenp and @iklam for reviews.

@kimbarrett
Copy link
Author

/integrate

@openjdk openjdk bot closed this Feb 20, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 20, 2021
@kimbarrett kimbarrett deleted the ht_shared branch February 20, 2021 03:02
@openjdk
Copy link

openjdk bot commented Feb 20, 2021

@kimbarrett Pushed as commit 5a25cea.

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

iignatev added a commit to iignatev/jdk that referenced this pull request Oct 20, 2021
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 serviceability serviceability-dev@openjdk.org
3 participants