8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize #15472

albertnetymk · 2023-08-29T16:15:44Z

Use more precise type and range for GCDrainStackTargetSize.

The change to TASKQUEUE_SIZE is there, because they are used in the same MIN2. (All uses expect TASKQUEUE_SIZE to be uint as well.)

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-8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize (Enhancement - P4)

Reviewers

Thomas Schatzl (@tschatzl - Reviewer)
Hamlin Li (@Hamlin-Li - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15472

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-08-29T16:16:32Z

👋 Welcome back ayang! 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-08-29T16:19:09Z

@albertnetymk 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.

mlbridge · 2023-08-29T16:23:22Z

Webrevs

01: Full - Incremental (12f8e961)
00: Full (483dfbec)

tschatzl · 2023-08-30T08:31:55Z

src/hotspot/share/gc/shared/gc_globals.hpp

          "Number of entries we will try to leave on the stack "            \
          "during parallel gc")                                             \
-          range(0, max_juint)                                               \
+          range(0, (max_juint-1)/2)                                               \


Suggested change

range(0, (max_juint-1)/2) \

range(0, (UINT_MAX - 1) / 2) \

Avoid using juint_* in code not interfacing java. Also the \ is indented improperly, and even in above suggestion it might still be.

tschatzl · 2023-08-30T08:32:58Z

src/hotspot/share/gc/shared/gc_globals.hpp

@@ -684,10 +684,10 @@
  develop(uintx, GCExpandToAllocateDelayMillis, 0,                          \
          "Delay between expansion and allocation (in milliseconds)")       \
                                                                            \
-  product(uintx, GCDrainStackTargetSize, 64,                                \
+  product(uint, GCDrainStackTargetSize, 64,                                \


Suggested change

product(uint, GCDrainStackTargetSize, 64, \

product(uint, GCDrainStackTargetSize, 64, \

tschatzl · 2023-08-30T08:33:39Z

src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

  if (partially) {
-    target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
+    target_size = MIN2(_task_queue->max_elems()/3, GCDrainStackTargetSize);


Suggested change

target_size = MIN2(_task_queue->max_elems()/3, GCDrainStackTargetSize);

target_size = MIN2(_task_queue->max_elems() / 3, GCDrainStackTargetSize);

openjdk · 2023-08-30T09:44:29Z

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

8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize

Reviewed-by: tschatzl, mli

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

c90cd2c: 8286789: Test forceEarlyReturn002.java timed out
89d18ea: 8312018: Improve reservation of class space and CDS
dd64a4a: 8315241: (fs) Move toRealPath tests in java/nio/file/Path/Misc.java to separate JUnit 5 test
8e4cda0: 8314834: serviceability/jdwp/AllModulesCommandTest.java ignores VM flags
1ea6463: 8314835: gtest wrappers should be marked as flagless
93e82c0: 8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to use vm flags
7daae1f: 8314263: Signed jars triggering Logger finder recursion and StackOverflowError
6701eba: 8315117: Update Zlib Data Compression Library to Version 1.3
e29f0c2: 8297777: Convert jdk.jlink StringSharingPlugin to use Class File API
bf63945: 8298992: runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)"
... and 8 more: https://git.openjdk.org/jdk/compare/e22762c010e5cd4c313e5f2816b67d75862935a7...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.

Hamlin-Li

LGTM.

albertnetymk · 2023-08-31T09:47:28Z

Thanks for the review.

/integrate

openjdk · 2023-08-31T09:49:17Z

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

b594f01: 8314748: 1-10% regressions on Crypto micros
39f1813: 8315318: Typo in comment on sun.nio.ch.Net.unblock4
47aa6f3: 8315219: G1: Improve allocator pathological case where it keeps doing direct allocations instead of retiring a PLAB
218829e: 8315421: [BACKOUT] 8314834 serviceability/jdwp/AllModulesCommandTest.java ignores VM flags
3c8a667: 8314611: Provide more explicative error message parsing Currencies
df5e6e5: 8315248: AssertionError in Name.compareTo
3eac890: 8315061: Make LockingMode a product flag
8419a53: 8315072: Remove unneeded AdaptivePaddedAverage::operator new
c90cd2c: 8286789: Test forceEarlyReturn002.java timed out
89d18ea: 8312018: Improve reservation of class space and CDS
... and 16 more: https://git.openjdk.org/jdk/compare/e22762c010e5cd4c313e5f2816b67d75862935a7...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-08-31T09:49:24Z

@albertnetymk Pushed as commit b0353ad.

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

g1-uint

483dfbe

openjdk bot changed the title ~~8315242~~ 8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize Aug 29, 2023

openjdk bot added the rfr Pull request is ready for review label Aug 29, 2023

openjdk bot added the hotspot hotspot-dev@openjdk.org label Aug 29, 2023

tschatzl suggested changes Aug 30, 2023

View reviewed changes

review

12f8e96

tschatzl approved these changes Aug 30, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 30, 2023

Hamlin-Li approved these changes Aug 30, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Aug 31, 2023

openjdk bot closed this Aug 31, 2023

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

albertnetymk deleted the g1-uint branch August 31, 2023 10:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize #15472

8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize #15472

albertnetymk commented Aug 29, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Aug 29, 2023

openjdk bot commented Aug 29, 2023

mlbridge bot commented Aug 29, 2023 •

edited

Loading

tschatzl Aug 30, 2023

tschatzl Aug 30, 2023

tschatzl Aug 30, 2023

openjdk bot commented Aug 30, 2023 •

edited

Loading

Hamlin-Li left a comment

albertnetymk commented Aug 31, 2023

openjdk bot commented Aug 31, 2023

openjdk bot commented Aug 31, 2023

	product(uint, GCDrainStackTargetSize, 64, \
	product(uint, GCDrainStackTargetSize, 64, \

	target_size = MIN2(_task_queue->max_elems()/3, GCDrainStackTargetSize);
	target_size = MIN2(_task_queue->max_elems() / 3, GCDrainStackTargetSize);

8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize #15472

8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize #15472

Conversation

albertnetymk commented Aug 29, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Aug 29, 2023

openjdk bot commented Aug 29, 2023

mlbridge bot commented Aug 29, 2023 • edited Loading

Webrevs

tschatzl Aug 30, 2023

Choose a reason for hiding this comment

tschatzl Aug 30, 2023

Choose a reason for hiding this comment

tschatzl Aug 30, 2023

Choose a reason for hiding this comment

openjdk bot commented Aug 30, 2023 • edited Loading

Hamlin-Li left a comment

Choose a reason for hiding this comment

albertnetymk commented Aug 31, 2023

openjdk bot commented Aug 31, 2023

openjdk bot commented Aug 31, 2023

albertnetymk commented Aug 29, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 29, 2023 •

edited

Loading

openjdk bot commented Aug 30, 2023 •

edited

Loading