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

8265682: G1: Mutex::_name dangling in HeapRegionRemSet references after JDK-8264146 #3639

Closed
wants to merge 2 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Apr 22, 2021

This change makes the Mutex constructor stdup the name passed in for the few cases that the name is constructed on the stack. Most names are shorter than 64 characters so it's still a savings.
Tested with tier1.


Progress

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

Issue

  • JDK-8265682: G1: Mutex::_name dangling in HeapRegionRemSet references after JDK-8264146

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3639/head:pull/3639
$ git checkout pull/3639

Update a local copy of the PR:
$ git checkout pull/3639
$ git pull https://git.openjdk.java.net/jdk pull/3639/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3639

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3639.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 22, 2021

👋 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
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

  • hotspot-runtime

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-runtime label Apr 22, 2021
@coleenp coleenp marked this pull request as ready for review Apr 23, 2021
@openjdk openjdk bot added the rfr label Apr 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 23, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Hi Coleen,

LGTM.

The strdup may have a slight impact on startup, but no more so than the previous implementation, so I think at worst we are back where we were. And we still get the memory savings, which was the primary goal.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

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

8265682: G1: Mutex::_name dangling in HeapRegionRemSet references after JDK-8264146

Reviewed-by: dholmes, sjohanss

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

  • b9f66d9: 8264188: Improve handling of assembly files in the JDK
  • c3ac690: 8261759: ZGC: ZWorker Threads Continue Marking After System.exit() called
  • 31abe68: 8265116: ZGC: Steal local stacks instead of flushing them
  • 83364a4: 8264258: Unknown lookups in the java package give misleading compilation errors
  • a9367db: 8265127: ZGC: Fix incorrect reporting of reclaimed memory
  • 1580a47: 8265911: assert(comp != __null) failed: Compiler instance missing
  • 9647fb0: 8265689: JVMCI: InternalError: Class java.lang.Object does not implement interface jdk.vm.ci.meta.JavaType
  • 0d08d73: 8265702: ZGC on macOS/aarch64
  • 45c5da0: 8265746: Update java.time to use instanceof pattern variable (part II)
  • a85f6cb: 8265613: False positives for "Related Packages"
  • ... and 21 more: https://git.openjdk.java.net/jdk/compare/891f72fe6ea545cdf845d26157a64315a93f9a06...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 label Apr 26, 2021
Copy link
Contributor

@kstefanj kstefanj left a comment

Looks good.

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Apr 26, 2021

Thanks David and Stefan for the reviews. The name is only used in debugging so if we had any reason to suspect performance regression we could ifdef it. I don't think it's worth doing that and it's good that it would be available in product right now.
Kim pointed out offline that I could use ASSERT_STREQ so I made the trivial change in the patch.

Copy link
Contributor

@kstefanj kstefanj left a comment

Still good, I don't think we should #ifdef it either.

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Apr 26, 2021

Thanks Stefan!
/integrate

@openjdk openjdk bot closed this Apr 26, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

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

  • 2b09ff2: 8232765: NullPointerException at Types.eraseNotNeeded() when compiling a class
  • b9f66d9: 8264188: Improve handling of assembly files in the JDK
  • c3ac690: 8261759: ZGC: ZWorker Threads Continue Marking After System.exit() called
  • 31abe68: 8265116: ZGC: Steal local stacks instead of flushing them
  • 83364a4: 8264258: Unknown lookups in the java package give misleading compilation errors
  • a9367db: 8265127: ZGC: Fix incorrect reporting of reclaimed memory
  • 1580a47: 8265911: assert(comp != __null) failed: Compiler instance missing
  • 9647fb0: 8265689: JVMCI: InternalError: Class java.lang.Object does not implement interface jdk.vm.ci.meta.JavaType
  • 0d08d73: 8265702: ZGC on macOS/aarch64
  • 45c5da0: 8265746: Update java.time to use instanceof pattern variable (part II)
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/891f72fe6ea545cdf845d26157a64315a93f9a06...master

Your commit was automatically rebased without conflicts.

Pushed as commit 222f9f0.

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

@coleenp coleenp deleted the strdup branch Apr 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
3 participants