Skip to content

Conversation

@iklam
Copy link
Member

@iklam iklam commented Aug 12, 2022

Fix two problems with synchronizer.hpp:

  • It's unnecessarily included in two popular headers: monitorChunk.hpp and frame_<cpu>.hpp. The latter is most problematic because it includes synchronizer.hpp in the middle of a class declaration!
  • synchronizer.hpp includes linkedlist.hpp. This can be avoid by moving the definition of Synchronizer::PtrList into synchronizer.cpp.

These headers are included much less after this PR (out of ~1000 hotspot .o files)

linkedlist.hpp    857 -> 101
synchronizer.hpp  848 -> 122
resourceHash.hpp  850 -> 270

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9849

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 12, 2022

👋 Welcome back iklam! 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 12, 2022

@iklam The following labels will be automatically applied to this pull request:

  • hotspot
  • serviceability
  • shenandoah

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.

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Aug 12, 2022
@iklam iklam marked this pull request as ready for review August 12, 2022 03:09
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 12, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 12, 2022

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Very nice.

@openjdk
Copy link

openjdk bot commented Aug 12, 2022

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

8292267: Clean up synchronizer.hpp

Reviewed-by: coleenp, dcubed, dholmes

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 12, 2022
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Looks great. I only posted a few nit comments.

#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP
#define SHARE_GC_SHENANDOAH_SHENANDOAHPADDING_HPP

#include "memory/padded.hpp"
Copy link
Member

Choose a reason for hiding this comment

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

This one surprised me, but I'm guessing it was included indirectly
from synchronizer.hpp via some frame header...

class JvmtiEnv;
class JvmtiThreadState;

class ThreadsList;
Copy link
Member

Choose a reason for hiding this comment

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

Not in sorted order relative to OopStorage. Does it need to be?

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks fine.

Thanks.

@iklam
Copy link
Member Author

iklam commented Aug 19, 2022

Thanks @coleenp @dholmes-ora @dcubed-ojdk for the review.
Tiers 1,2 and build-tier5 passed on top of #9927
/integrate

@openjdk
Copy link

openjdk bot commented Aug 19, 2022

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

  • 1f3578b: 8292446: Make TableRateStatistics optional in CHT
  • 45dec48: 8292592: JFR test TestNative is not reliable due to low rate of sampling.
  • 58aae34: 8292576: Improve wording of AccessFlag-related specs
  • 5ca268c: 8292636: (dc) Problem listing of java/nio/channels/DatagramChannel/Unref.java has incorrect issue ID
  • 37aa7c1: 8292559: Add test for -XX:+CheckJNICalls showing changed signal handlers
  • f2f0cd8: 8292511: AArch64: Align CPU feature name for NEON with hwcap
  • 1f484da: 8289562: Change bugs.java.com and bugreport.java.com URL's to https
  • 63a126a: 8292607: Remove unused dirty and dirty_card_range_after_reset in CardTable
  • 7d18ebd: 8292606: G1 and Epsilon header cleanup for JDK-8282729

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 19, 2022

@iklam Pushed as commit 7244dd6.

💡 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 hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

4 participants