8299915: Remove ArrayAllocatorMallocLimit and associated code #15859

afshin-zafari · 2023-09-21T12:02:24Z

ArrayAllocatorMallocLimit is removed. The test cases that tested it also are removed.
AllocArrayAllocator instances are replaced with MallocArrayAllocator.
The signature of CHeapBitMap::free(ptr, size) is kept as it is, since it is called in this way from GrowableBitMap<T>::resize, where T can be also ArenaBitMap and ResourceBitMap. However, it uses MallocArrayAllocator::free(ptr) and ignores the size:

void CHeapBitMap::free(bm_word_t* map, idx_t size_in_words) const { 
 MallocArrayAllocator<bm_word_t>::free(map);
}

Test

tiers1-4 passed on all platforms.

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-8299915: Remove ArrayAllocatorMallocLimit and associated code (Enhancement - P4)

Reviewers

David Holmes (@dholmes-ora - Reviewer)
Coleen Phillimore (@coleenp - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15859

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-09-21T12:03:59Z

👋 Welcome back azafari! 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 · 2023-09-21T12:07:34Z

@afshin-zafari The following labels will be automatically applied to this pull request:

hotspot
serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-09-21T12:11:57Z

Webrevs

dholmes-ora

Functional removal of code looks good, but some of the test changes need to be changed.

Thanks.

dholmes-ora · 2023-09-22T02:40:39Z

test/hotspot/jtreg/serviceability/attach/AttachSetGetFlag.java

-    // Test a non-manageable size_t flag.
-    // Since it is not manageable, we can't test the setFlag functionality.
-    testGetFlag("ArrayAllocatorMallocLimit", "128");
-    // testSetFlag("ArrayAllocatorMallocLimit", "64", "128");
-


You need to replace this with another non-manageable size_t flag so that code coverage is maintained.

dholmes-ora · 2023-09-22T02:42:25Z

test/lib-test/jdk/test/whitebox/vm_flags/SizeTTest.java

This test also should not be removed but changed to use a different size_t flag so that the WB functionality continues to be tested for a flag of this type.

dholmes-ora · 2023-09-26T02:04:14Z

test/hotspot/jtreg/serviceability/attach/AttachSetGetFlag.java

@@ -57,6 +57,10 @@ public static void main(String... args) throws Exception {
    testGetFlag("MaxHeapFreeRatio", "60");
    testSetFlag("MaxHeapFreeRatio", "50", "60");

+    // Test a non-manageable size_t flag.
+    // Since it is not manageable, we can't test the setFlag functionality.
+    testGetFlag("StringDeduplicationCleanupDeadMinimum", "128");


A non-experimental flag, like MetaspaceSize, might be better long term in case the experimental flag get removed again.

When MetaspaceSize is set to 0, following assertion raised at metaspace.cpp: 316

size_t MetaspaceGC::capacity_until_GC() { size_t value = Atomic::load_acquire(&_capacity_until_GC); assert(value >= MetaspaceSize, "Not initialized properly?"); // <----- return value; }

LargePageSizeInBytes is used instead.

dholmes-ora · 2023-09-26T02:07:41Z

test/lib-test/jdk/test/whitebox/vm_flags/SizeTTest.java

@@ -35,7 +35,7 @@
 import jdk.test.lib.Platform;

 public class SizeTTest {
-    private static final String FLAG_NAME = "ArrayAllocatorMallocLimit";
+    private static final String FLAG_NAME = "StringDeduplicationCleanupDeadMinimum";


Again a non-experimental flag, like MetaspaceSize, might be better here.

MetaspaceSize is used with its lower bound 65536. Otherwise, the test fails.

dholmes-ora

Thanks for test changes. Seems fine. Thanks.

openjdk · 2023-09-26T20:55:44Z

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

8299915: Remove ArrayAllocatorMallocLimit and associated code

Reviewed-by: dholmes, coleenp

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

788e6e1: 8316218: Open some swing tests 5
ee9776f: 8304839: Move TestScaffold.main() to the separate class DebugeeWrapper
36ac839: 8073061: (fs) Files.copy(foo, bar, REPLACE_EXISTING) deletes bar even if foo is not readable
efb7e85: 8316935: [s390x] Use consistent naming for lightweight locking in MacroAssembler
4e1e579: 8315920: C2: "control input must dominate current control" assert failure
1f7dfda: 8316671: sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java test fails intermittent with Read timed out
20ff603: 8316735: Print LockStack in hs_err files
e510dee: 8316098: Revise signature of numa_get_leaf_groups
1513e79: 8316940: Serial: Remove unused declarations in genCollectedHeap
52983ed: 8303737: C2: Load can bypass subtype check that enforces it's from the right object type
... and 107 more: https://git.openjdk.org/jdk/compare/fab372d3a23b17f64ae4306e28bdb0bc511f4912...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.

coleenp

This looks good to me.

afshin-zafari · 2023-09-27T08:24:43Z

Thank you @coleenp and @dholmes-ora for your reviews.
/integrate

openjdk · 2023-09-27T08:27:04Z

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

50a7a04: 8316417: ObjectMonitorIterator does not return the most recent monitor and is incorrect if no monitors exists
fee9d33: 8293176: SSLEngine handshaker does not send an alert after a bad parameters
fd52be2: 8316895: SeenThread::print_action_queue called on a null pointer
e39197e: 8316933: RISC-V: compiler/vectorapi/VectorCastShape128Test.java fails when using RVV
b659e03: 8316897: tools/jpackage/junit tests fail on AIX after JDK-8316547
83806ab: 6450193: After the first Serialization, JTableHeader does not uninstall its UI
2f311d5: 8316211: Open source several manual applet tests
65227a3: 8316389: Open source few AWT applet tests
788e6e1: 8316218: Open some swing tests 5
ee9776f: 8304839: Move TestScaffold.main() to the separate class DebugeeWrapper
... and 115 more: https://git.openjdk.org/jdk/compare/fab372d3a23b17f64ae4306e28bdb0bc511f4912...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-09-27T08:27:11Z

@afshin-zafari Pushed as commit 45a145e.

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

8299915: Remove ArrayAllocatorMallocLimit and associated code

3371127

openjdk bot added the rfr Pull request is ready for review label Sep 21, 2023

openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Sep 21, 2023

dholmes-ora suggested changes Sep 22, 2023

View reviewed changes

other size_t flags than the ArrayAllocatorMallocLimit are used in tests.

623d076

dholmes-ora reviewed Sep 26, 2023

View reviewed changes

afshin-zafari added 2 commits September 26, 2023 10:12

The size_t LargePageSizeInBytes option is used.

4a73924

MetaspaceSize and its lower bound is used.

e2acfcb

dholmes-ora approved these changes Sep 26, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 26, 2023

coleenp approved these changes Sep 26, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Sep 27, 2023

openjdk bot closed this Sep 27, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8299915: Remove ArrayAllocatorMallocLimit and associated code #15859

8299915: Remove ArrayAllocatorMallocLimit and associated code #15859

afshin-zafari commented Sep 21, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 21, 2023

openjdk bot commented Sep 21, 2023

mlbridge bot commented Sep 21, 2023 •

edited

Loading

dholmes-ora left a comment

dholmes-ora Sep 22, 2023

afshin-zafari Sep 25, 2023

dholmes-ora Sep 22, 2023

afshin-zafari Sep 25, 2023

dholmes-ora Sep 26, 2023

afshin-zafari Sep 26, 2023

dholmes-ora Sep 26, 2023

afshin-zafari Sep 26, 2023

dholmes-ora left a comment

openjdk bot commented Sep 26, 2023 •

edited

Loading

coleenp left a comment

afshin-zafari commented Sep 27, 2023

openjdk bot commented Sep 27, 2023

openjdk bot commented Sep 27, 2023

8299915: Remove ArrayAllocatorMallocLimit and associated code #15859

8299915: Remove ArrayAllocatorMallocLimit and associated code #15859

Conversation

afshin-zafari commented Sep 21, 2023 • edited by openjdk bot Loading

Test

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Sep 21, 2023

openjdk bot commented Sep 21, 2023

mlbridge bot commented Sep 21, 2023 • edited Loading

Webrevs

dholmes-ora left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 26, 2023 • edited Loading

coleenp left a comment

Choose a reason for hiding this comment

afshin-zafari commented Sep 27, 2023

openjdk bot commented Sep 27, 2023

openjdk bot commented Sep 27, 2023

afshin-zafari commented Sep 21, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 21, 2023 •

edited

Loading

openjdk bot commented Sep 26, 2023 •

edited

Loading