Skip to content

8260630: Templatize literal_size #2310

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
Closed
kimbarrett wants to merge 2 commits into from
Closed

8260630: Templatize literal_size #2310

kimbarrett wants to merge 2 commits into from

Conversation

@kimbarrett
Copy link

@kimbarrett kimbarrett commented Jan 29, 2021 •
edited by openjdk bot
Loading

Please review a couple of small cleanups in Hashtable support.

(1) Replace some "default" overloads for literal_size with a template. This
makes it easier to add new Hashtable value types whose sizes aren't
interesting for statistics printout.

(2) Trivial change to remove no longer used instantiation of Hashtable
support for oop values.

Testing:
mach5 tier1

/issue add 8260629

Progress

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

Issues

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 29, 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.

@kimbarrett kimbarrett marked this pull request as ready for review January 29, 2021 08:45
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 29, 2021
@openjdk
Copy link

openjdk bot commented Jan 29, 2021

@kimbarrett
Adding additional issue to issue list: 8260629: Remove explicit instantiation of Hashtable with oop value.

@openjdk
Copy link

openjdk bot commented Jan 29, 2021

@kimbarrett 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 Jan 29, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 29, 2021

Webrevs

pliden
pliden approved these changes Jan 29, 2021
View reviewed changes
Copy link
Contributor

@pliden pliden 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 to me!

@openjdk
Copy link

openjdk bot commented Jan 29, 2021 •
edited
Loading

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

8260630: Templatize literal_size
8260629: Remove explicit instantiation of Hashtable with oop value

Reviewed-by: pliden, tschatzl, coleenp

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:

  • d2b0ea1: 8260282: Add option to compress heap dumps created by -XX:+HeapDumpOnOutOfMemoryError
  • a5fb517: 8259404: Shenandoah: Fix time tracking in parallel_cleaning
  • 0675473: 8252409: JShell: Intersection types cause NoSuchFieldError

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 29, 2021
tschatzl
tschatzl approved these changes Jan 29, 2021
View reviewed changes
Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.

coleenp
coleenp approved these changes Jan 29, 2021
View reviewed changes
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.

Looks good!

src/hotspot/share/utilities/hashtable.cpp
//
// Note: if you create a new subclass of Hashtable<MyNewType, F>, you will need to
// add a new function static int literal_size(MyNewType lit)
// because I can't get template <class T> int literal_size(T) to pick the specializations for Symbol and oop.
Copy link
Contributor

@coleenp coleenp Jan 29, 2021

Choose a reason for hiding this comment

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

I wrote that. Thanks for fixing this!

src/hotspot/share/utilities/hashtable.cpp
return symbol->size() * HeapWordSize;
}

static int literal_size(oop obj) {
Copy link
Contributor

@coleenp coleenp Jan 29, 2021

Choose a reason for hiding this comment

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

Is literal_size(oop) still needed?

Copy link
Author

@kimbarrett kimbarrett Jan 29, 2021

Choose a reason for hiding this comment

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

It's used by literal_size(WeakHandle).

@kimbarrett
Copy link
Author

kimbarrett commented Jan 30, 2021

Thanks @pliden , @coleenp , @tschatzl for reviews.

@kimbarrett
Copy link
Author

kimbarrett commented Jan 30, 2021

/integrate

@openjdk openjdk bot closed this Jan 30, 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 Jan 30, 2021
@openjdk
Copy link

openjdk bot commented Jan 30, 2021

@kimbarrett Since your change was applied there have been 15 commits pushed to the master branch:

  • 6b24e98: 8259008: ArithmeticException was thrown at "Monitor Cache Dump" on HSDB
  • 69ee314: 8249867: xml declaration is not followed by a newline
  • fb46c91: 8260674: ProblemList jdk/incubator/vector/VectorHash.java in Xcomp configs
  • 71bfe96: 8217633: Configurable extensions with system properties
  • f5ca838: 8065773: JDI: UOE is not thrown, when redefineClasses changes a class modifier
  • 739bbd0: 8260566: Pattern type X is a subtype of expression type Y message is incorrect
  • b2e582a: 8259905: Compiler treats 'sealed' keyword as 'var' keyword
  • 6415d3b: 8259584: SuperWord::fix_commutative_inputs checks in_bb(fin1) instead of in_bb(fin2)
  • b7b391b: 8260625: Rename MetaspaceExpand_lock
  • 22bfa5b: 8255837: Shenandoah: Remove ShenandoahConcurrentRoots class
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/64a150c518ed1a936cd6e4cb5e60060243496901...master

Your commit was automatically rebased without conflicts.

Pushed as commit 67a34da.

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

@kimbarrett kimbarrett deleted the templatize_literal_size branch January 30, 2021 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@pliden pliden pliden approved these changes

@tschatzl tschatzl tschatzl approved these changes

@coleenp coleenp coleenp approved these changes

Reviewers whose approvals may not affect merge requirements

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.

4 participants

@kimbarrett @pliden @tschatzl @coleenp