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

8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes #18303

Closed
wants to merge 2 commits into from

Conversation

lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Mar 14, 2024

Hi all,

The method EpsilonHeap::allocate_work misuses the parameter size as size in bytes. Actually, the parameter size is size in words. This patch fixes it.

The test command make test TEST=test/hotspot/jtreg/gc/epsilon passed locally.

Thanks for taking the time to review.

Best Regards,
-- Guoxiong


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-8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18303

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 14, 2024

👋 Welcome back gli! 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 Mar 14, 2024

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

8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes

Reviewed-by: shade, tschatzl

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

  • 80ccc98: 8328075: Shenandoah: Avoid forwarding when objects don't move in full-GC
  • 5249cc0: 8328087: Automate javax/swing/JTable/TAB/TAB.java applet test
  • c05f8c7: 8316388: Opensource five Swing component related regression tests
  • b8dfeaf: 8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automatic main test
  • d57bdd8: 8328165: improve assert(idx < _maxlrg) failed: oob
  • 128e60a: 8328037: Test java/util/Formatter/Padding.java has unnecessary high heap requirement after JDK-8326718
  • 06f4b7f: 8327756: Convert javax/swing/JSlider/4987336/bug4987336.java applet to main
  • 605800e: 8203867: Delete test java/awt/TrayIcon/DblClickActionEventTest/DblClickActionEventTest.html
  • 0943937: 8328218: Delete test java/awt/Window/FindOwner/FindOwner.html
  • f6390e5: 8328089: Automate javax/swing/JTable/4222153/bug4222153.java applet test

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 changed the title JDK-8328166 8328166: Epsilon: 'EpsilonHeap::allocate_work' misuses the parameter 'size' as size in bytes Mar 14, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 14, 2024
@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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

  • hotspot-gc

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-gc hotspot-gc-dev@openjdk.org label Mar 14, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 14, 2024

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Right, good catch! This looks like a day 1 Epsilon issue, and we never noticed, because it really matters only for large objects near heap exhaustion.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 14, 2024
@lgxbslgx
Copy link
Member Author

Thanks @shipilev for your review. Waiting for another review.

@lgxbslgx
Copy link
Member Author

The test test/jdk/java/util/HashMap/WhiteBoxResizeTest.java failed in Pre-submit tests. But it passed at #18304.

@lgxbslgx
Copy link
Member Author

@shipilev @tschatzl Thanks for your reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 15, 2024

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

  • bf990c8: 8328269: NonFocusablePopupMenuTest.java should be marked as headful
  • 80b98c8: 8320503: Print warning if VM reaches MallocLimit during error reporting
  • dde519d: 8328066: WhiteBoxResizeTest failure on linux-x86: Could not reserve enough space for 2097152KB object heap
  • 80ccc98: 8328075: Shenandoah: Avoid forwarding when objects don't move in full-GC
  • 5249cc0: 8328087: Automate javax/swing/JTable/TAB/TAB.java applet test
  • c05f8c7: 8316388: Opensource five Swing component related regression tests
  • b8dfeaf: 8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automatic main test
  • d57bdd8: 8328165: improve assert(idx < _maxlrg) failed: oob
  • 128e60a: 8328037: Test java/util/Formatter/Padding.java has unnecessary high heap requirement after JDK-8326718
  • 06f4b7f: 8327756: Convert javax/swing/JSlider/4987336/bug4987336.java applet to main
  • ... and 3 more: https://git.openjdk.org/jdk/compare/e8d1ba33b48dc8e6b937258c3765b91426c5b6f1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 15, 2024

@lgxbslgx Pushed as commit 90ab52e.

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

@lgxbslgx lgxbslgx deleted the MISUSE-SIZE branch March 15, 2024 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
3 participants