Skip to content

8292068: Convert ModuleEntryTable into ResourceHashtable #9809

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

8292068: Convert ModuleEntryTable into ResourceHashtable #9809

wants to merge 3 commits into from

Conversation

@coleenp
Copy link
Contributor

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

Converted the ModuleEntryTable to use ResourceHashtable.
Ran tiers 1-7. Also ran performance tests with this and other changes with no performance difference, although the footprint of this should be better.

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-8292068: Convert ModuleEntryTable into ResourceHashtable

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9809

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 9, 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 9, 2022
@openjdk
Copy link

openjdk bot commented Aug 9, 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 9, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 9, 2022 •
edited
Loading

Webrevs

iklam
iklam suggested changes Aug 10, 2022
View reviewed changes
src/hotspot/share/classfile/moduleEntry.cpp Outdated
class ModuleEntryTableDeleter : public StackObj {
public:
bool do_entry(const Symbol*& name, ModuleEntry*& entry) {
ResourceMark rm;
Copy link
Member

@iklam iklam Aug 10, 2022

Choose a reason for hiding this comment

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

The ResourceMark should be used inside log_is_enabled(...)

Copy link
Contributor Author

@coleenp coleenp Aug 10, 2022

Choose a reason for hiding this comment

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

this usage is ugly but I'll add it because of the as_C_string() is used only if logging.

@coleenp
Copy link
Contributor Author

coleenp commented Aug 10, 2022 •
edited
Loading

Thanks Ioi for reviewing this! I fixed the code for your comments and am rerunning tier1-3 in case of other missing Module_locks. I already ran jfr tests since there are places where jfr iterates through modules.

lfoltan
lfoltan approved these changes Aug 10, 2022
View reviewed changes
Copy link
Member

@lfoltan lfoltan 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 Coleen!
Thanks,
Lois

@openjdk
Copy link

openjdk bot commented Aug 10, 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:

8292068: Convert ModuleEntryTable into ResourceHashtable

Reviewed-by: iklam, lfoltan

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:

  • 7b029ea: 8227651: Tests fail with SSLProtocolException: Input record too big
  • 35fd5d8: 8292200: Add java/io/File/GetXSpace.java to Windows problem list
  • 9825c33: 8291641: Optimize StackTraceElement.toString()
  • cb37282: 8291752: AArch64: Remove check_emit_size parameter from trampoline_call
  • 37d3146: 8289002: Minimal x86_64 VM build fails with GCC 11: 'this' pointer is null
  • ecfa38f: 8281966: Absolute path of symlink is null in JFileChooser
  • 83dc2e3: 8292062: misc javax/swing tests failing
  • 4913380: 8292007: Do not include vmSymbol.hpp in method.hpp
  • 6397d56: 8151430: (fs) BasicFileAttributeView.setTimes should support setting file create time on OS X
  • 57e0da1: 8292132: ProblemList jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
  • ... and 7 more: https://git.openjdk.org/jdk/compare/0ade2641f78c1ab890de658095b6b54e52f8d5ab...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 10, 2022
iklam
iklam approved these changes Aug 10, 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.

LGTM.

@coleenp
Copy link
Contributor Author

coleenp commented Aug 10, 2022

I had to revert the modules_do asserts and locks because of JDK-8292202.

@coleenp
Copy link
Contributor Author

coleenp commented Aug 10, 2022

Thanks Ioi and Lois.

@coleenp
Copy link
Contributor Author

coleenp commented Aug 10, 2022

Thanks for the reviews, Ioi and Lois. GHA happy.
/integrate

@openjdk
Copy link

openjdk bot commented Aug 10, 2022

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 10, 2022

@coleenp Pushed as commit b47438c.

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

@coleenp coleenp deleted the module-table branch August 10, 2022 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@iklam iklam iklam approved these changes

@lfoltan lfoltan lfoltan 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.

3 participants

@coleenp @iklam @lfoltan