Skip to content

Conversation

@coleenp
Copy link
Contributor

@coleenp coleenp commented Feb 9, 2023

Please review change to make PlaceholderEntry::_supername a SymbolHandle to correctly refcount the symbol rather than have ad-hoc code. It also moves the private functions to private and asserts invariant that find_and_remove must always find a matching entry. Finally, this also more eagerly removes the supername symbol from the placeholder entry, so I have to fix the test in #12491 before pushing this.
Tested with tier1-4.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12495

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 9, 2023

👋 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 Feb 9, 2023
@openjdk
Copy link

openjdk bot commented Feb 9, 2023

@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 Feb 9, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 9, 2023

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Took me a while to get my head around the SymbolHandle mechanics for ref counting, but once I did this looks good. :) Thanks.

@openjdk
Copy link

openjdk bot commented Feb 10, 2023

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

8302108: Clean up placeholder supername code

Reviewed-by: dholmes, 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 28 new commits pushed to the master branch:

  • d503c66: 8302155: [AIX] NUM_LCPU is not required variable
  • c37e9d1: 8298293: NMT: os::realloc() should verify that flags do not change between reallocations
  • 101db26: 8301697: [s390] Optimized-build is broken
  • f4d4fa5: 8300255: Introduce interface for GC oop verification in the assembler
  • 99b6c0e: 8302289: RISC-V: Use bgez instruction in arraycopy_simple_check when possible
  • 57aef85: 8301838: PPC: continuation yield intrinsic: exception check not needed if yield succeeded
  • df93880: 8301942: java/net/httpclient/DigestEchoClientSSL.java fail with -Xcomp
  • 0025764: 8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
  • 1f9c110: 8301958: Reduce Arrays.copyOf/-Range overheads
  • cb81073: 8300139: [AIX] Use pthreads to avoid JNI_createVM call from primordial thread
  • ... and 18 more: https://git.openjdk.org/jdk/compare/db1b48ef3bb4f8f0fbb6879200c0655b7fe006eb...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 Feb 10, 2023
@coleenp
Copy link
Contributor Author

coleenp commented Feb 13, 2023

Thanks David. I had printf code to verify what SymbolHandle refcounting did to understand it but it's better that it just works rather than ad-hoc ref counting.
Thanks for reviewing!

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. Just a small nit.

void add_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action);
bool remove_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action);

SeenThread* superThreadQ() const { return _superThreadQ; }
Copy link
Member

Choose a reason for hiding this comment

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

If you just want to change these function to private, instead of moving them, I would suggest adding private: and public: keywords around them. That way we can limit the delta.

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 really wanted them moved to the section of the class where the other private methods are. This class isn't so overgrown that we need to keep switching from private to public, and I want the public methods to be together.
Java is nice in that you can have 'private' and 'public' keywords on each function, but I'd still like to keep the public ones together.

@coleenp
Copy link
Contributor Author

coleenp commented Feb 13, 2023

Thanks for reviewing Ioi!
/integrate

@openjdk
Copy link

openjdk bot commented Feb 13, 2023

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

  • d503c66: 8302155: [AIX] NUM_LCPU is not required variable
  • c37e9d1: 8298293: NMT: os::realloc() should verify that flags do not change between reallocations
  • 101db26: 8301697: [s390] Optimized-build is broken
  • f4d4fa5: 8300255: Introduce interface for GC oop verification in the assembler
  • 99b6c0e: 8302289: RISC-V: Use bgez instruction in arraycopy_simple_check when possible
  • 57aef85: 8301838: PPC: continuation yield intrinsic: exception check not needed if yield succeeded
  • df93880: 8301942: java/net/httpclient/DigestEchoClientSSL.java fail with -Xcomp
  • 0025764: 8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
  • 1f9c110: 8301958: Reduce Arrays.copyOf/-Range overheads
  • cb81073: 8300139: [AIX] Use pthreads to avoid JNI_createVM call from primordial thread
  • ... and 18 more: https://git.openjdk.org/jdk/compare/db1b48ef3bb4f8f0fbb6879200c0655b7fe006eb...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 13, 2023

@coleenp Pushed as commit abbeb7e.

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

@coleenp coleenp deleted the placeholder-cleanup branch February 13, 2023 20:59
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

Development

Successfully merging this pull request may close these issues.

3 participants