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

JDK-8292071: NMT: move MallocHeader to its own header and inline header checks #9801

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Aug 9, 2022

MallocHeader should be moved into its own header in preparation for further NMT changes.

Also, malloc header check routines - that are called on every free and realloc - should be inlined.

This is a plain code move. The classes were not changed, apart from making some of the functions inline, and fixing includes.


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-8292071: NMT: move MallocHeader to its own header and inline header checks

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9801

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

Using diff file

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

@tstuefe tstuefe force-pushed the JDK-8292071-move-mallocheader-to-its-own-header branch from 5063b10 to 27961c8 Compare August 9, 2022 05:41
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 9, 2022

👋 Welcome back stuefe! 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 bot commented Aug 9, 2022

@tstuefe 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 hotspot-runtime-dev@openjdk.org label Aug 9, 2022
@tstuefe tstuefe marked this pull request as ready for review August 9, 2022 08:22
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 9, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 9, 2022

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Aug 10, 2022

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

8292071: NMT: move MallocHeader to its own header and inline header checks

Reviewed-by: mbaesken, lucy, 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 79 new commits pushed to the master branch:

  • 36ef4c1: 8291081: Some sun/tools/jstatd/TestJstatd* tests fail with "Not a percentage: 68.31: expected true, was false"
  • b47438c: 8292068: Convert ModuleEntryTable into ResourceHashtable
  • 543163a: 8291978: jpackage: allow to override primary l10n files on Windows
  • 68af7c1: 8291734: Return accurate ACC_SUPER access flag for classes
  • e4925a3: 8291924: jpackage: l10n for Windows context menu label
  • 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
  • ... and 69 more: https://git.openjdk.org/jdk/compare/349397318687fdb7be8f50f02b536e49bffdd92f...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
Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Changes are duplicated by #9802. Why this? Isn't this one obsolete then?

@tstuefe
Copy link
Member Author

tstuefe commented Aug 10, 2022

Changes are duplicated by #9802. Why this? Isn't this one obsolete then?

#9802 builds atop of this PR. I experimented with PR sequences to speed up work while keeping changes fine granular and easy to review.

@RealLucy
Copy link
Contributor

I experimented with PR sequences to speed up work while keeping changes fine granular and easy to review.

I understand the motivation but don't really like the approach. It's basically mixing changes.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

With the explanation given: LGTM.

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.

@tstuefe
Copy link
Member Author

tstuefe commented Aug 11, 2022

Thanks @MBaesken , @RealLucy and @iklam !

/integrate

@openjdk
Copy link

openjdk bot commented Aug 11, 2022

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

  • 85a6023: Merge
  • 4c6d22a: 8288769: Revert unintentional change to deflate.c
  • 5fce02e: 8291496: Allocating card table before heap causes underflow asserts in CardTable::addr_for()
  • 0def531: 8290889: JDK 19 RDP2 L10n resource files update - msgdrop 10
  • 4b03e13: 8285405: add test and check for negative argument to HashMap::newHashMap et al
  • 2e0a17c: 8292187: aarch64: Remove duplicate header files
  • 36ef4c1: 8291081: Some sun/tools/jstatd/TestJstatd* tests fail with "Not a percentage: 68.31: expected true, was false"
  • b47438c: 8292068: Convert ModuleEntryTable into ResourceHashtable
  • 543163a: 8291978: jpackage: allow to override primary l10n files on Windows
  • 68af7c1: 8291734: Return accurate ACC_SUPER access flag for classes
  • ... and 75 more: https://git.openjdk.org/jdk/compare/349397318687fdb7be8f50f02b536e49bffdd92f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 11, 2022

@tstuefe Pushed as commit 3aaffd6.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants