8267937: Wrong indentation in G1 gc+phases log for free cset subphases

[tschatzl]

Hi all,

JDK-8214327: Join parallel phases post evacuation messed up some indentation of logging:

The current gc+phases=trace looks as follows:

[0.059s][debug][gc,phases   ] GC(1)       Redirty Logged Cards (ms):     Min:  0.0, Avg:  0.0, Max:  0.0, Diff:  0.0, Sum:  0.0, Workers: 3
[0.059s][debug][gc,phases   ] GC(1)         Redirtied Cards:               Min: 0, Avg: 184.3, Max: 531, Diff: 531, Sum: 553, Workers: 3
[0.059s][debug][gc,phases   ] GC(1)       Free Collection Set (ms):      Min:  0.0, Avg:  0.0, Max:  0.0, Diff:  0.0, Sum:  0.0, Workers: 3
[0.059s][trace][gc,phases   ] GC(1)           Young Free Collection Set (ms): Min:  0.0, Avg:  0.0, Max:  0.0, Diff:  0.0, Sum:  0.0, Workers: 1
[0.059s][trace][gc,phases   ] GC(1)           Non-Young Free Collection Set (ms): skipped

Young Free Collection Set and Non-Young Free Collection set are indented one level too many.

This change fixes this.

Testing: manual testing, there is no indentation check for log messages

Thanks,
Thomas

---

Progress

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

Issue

• JDK-8267937: Wrong indentation in G1 gc+phases log for free cset subphases

Reviewers

• Albert Mingkun Yang (@albertnetymk - Committer)
• Stefan Johansson (@kstefanj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4249

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

Using diff file

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

[bridgekeeper]

👋 Welcome back tschatzl! 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]

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

[mlbridge]

Webrevs

• 00: Full (e66df6c0)

[kstefanj]

Looks good.

[openjdk]

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

8267937: Wrong indentation in G1 gc+phases log for free cset subphases

Reviewed-by: ayang, 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 23 new commits pushed to the master branch:

• f5634fe: 8267979: C2: Fix verification code in SubTypeCheckNode::Ideal()
• ae2f37f: 8267616: AArch64: Fix AES assertion messages in stubGenerator_aarch64.cpp
• c06db45: 8267921: Remove redundant loop from sun.reflect.misc.ReflectUtil.privateCheckPackageAccess()
• 382e7ec: 8246351: elements in headings are of incorrect size
• 5df25dc088cfc3069e451b48c4f013d1d0491aa2: 8266807: Windows os_windows-gtest broken for UseLargePages
• ce44cd6881bcbef81a840d7961a951ba586c0eae: 8267845: Add @requires to avoid running G1 large pages test with wrong page size
• 4ade125c8a53e0bdc105e5f65e8c1d7aa13db950: 8267934: remove dead code in CLD
• bd31653e6f99d4337e4af1f7f138d688ec99c19d: 8267938: (sctp) SCTP channel factory methods should check platform support
• 7ab6b4012026d4786a4c3937b559da9d3142a228: 8267375: Aarch64: JVM crashes with option -XX:PrintIdealGraphLevel=3 on SVE backend
• 2c8e94f6804fee269a882a3e92b7ce844451eb11: 8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder
• ... and 13 more: https://git.openjdk.java.net/jdk/compare/1d2c7ac3f7492b335757bf0fd3f6ca3941c5fc72...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.

[tschatzl]

Thanks @albertnetymk @kstefanj for your reviews.

/integrate

[openjdk]

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

• ffd28c4: 8267947: CI: Preserve consistency between has_subklass() and is_subclass_of()
• 229a6e2: 8267095: Miscellaneous cleanups in vm.runtime.defmeth tests
• 6149b9a: 8267914: Remove DeferredObjectToKlass workaround
• 4eb2168: 8267670: Update java.io, java.math, and java.text to use switch expressions
• f5634fe: 8267979: C2: Fix verification code in SubTypeCheckNode::Ideal()
• ae2f37f: 8267616: AArch64: Fix AES assertion messages in stubGenerator_aarch64.cpp
• c06db45: 8267921: Remove redundant loop from sun.reflect.misc.ReflectUtil.privateCheckPackageAccess()
• 382e7ec: 8246351: elements in headings are of incorrect size
• 5df25dc088cfc3069e451b48c4f013d1d0491aa2: 8266807: Windows os_windows-gtest broken for UseLargePages
• ce44cd6881bcbef81a840d7961a951ba586c0eae: 8267845: Add @requires to avoid running G1 large pages test with wrong page size
• ... and 17 more: https://git.openjdk.java.net/jdk/compare/1d2c7ac3f7492b335757bf0fd3f6ca3941c5fc72...master

Your commit was automatically rebased without conflicts.

Pushed as commit 1c7c0e1de0c69f5c6082c3217b0baa33c0fbb0a8.

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