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

8292692: Move MethodCounters inline functions out of method.hpp #15094

Closed
wants to merge 2 commits into from

Conversation

matias9927
Copy link
Contributor

@matias9927 matias9927 commented Jul 31, 2023

The inline functions related to MethodCounters in method.hpp can be moved to the inline file to reduce the number of includes. Verified with tier 1-5 tests.

Below is a comparison of the old and new include statistics:

Old
----
scanning    836 methodCounters.hpp
   2 found    836 method.hpp

scanning    837 invocationCounter.hpp
   2 found    836 method.hpp
   3 found    836 methodCounters.hpp
   4 found    649 interp_masm_x86.hpp
   5 found      0 interp_masm_aarch64.hpp
   6 found      0 interp_masm_arm.hpp
   7 found      0 interp_masm_ppc.hpp
   8 found      0 interp_masm_riscv.hpp
   9 found      0 interp_masm_s390.hpp
  10 found      0 interp_masm_zero.hpp

scanning    298 method.inline.hpp
   2 found    286 continuationEntry_x86.inline.hpp
   3 found      0 continuationEntry_aarch64.inline.hpp
   4 found      0 continuationEntry_ppc.inline.hpp
   5 found      0 continuationEntry_riscv.inline.hpp
New
-----
scanning    304 methodCounters.hpp
   2 found    299 method.inline.hpp

scanning    476 invocationCounter.hpp
   2 found    304 methodCounters.hpp
   3 found    257 methodData.hpp
   4 found      0 interp_masm_aarch64.hpp
   5 found      0 interp_masm_ppc.hpp
   6 found      0 interp_masm_riscv.hpp
   7 found      0 interp_masm_s390.hpp
   8 found      0 interp_masm_zero.hpp

scanning    299 method.inline.hpp
   2 found    286 continuationEntry_x86.inline.hpp
   3 found      0 continuationEntry_aarch64.inline.hpp
   4 found      0 continuationEntry_ppc.inline.hpp
   5 found      0 continuationEntry_riscv.inline.hpp

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-8292692: Move MethodCounters inline functions out of method.hpp (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15094

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 31, 2023

👋 Welcome back matsaave! 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 Jul 31, 2023

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

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Jul 31, 2023
@matias9927 matias9927 force-pushed the methodcounters_8292692 branch from 7cb28af to ce2d516 Compare August 3, 2023 17:11
@matias9927 matias9927 force-pushed the methodcounters_8292692 branch from f5ee1d9 to d2a0d04 Compare September 5, 2023 21:38
@matias9927 matias9927 force-pushed the methodcounters_8292692 branch from fad0349 to dcffac7 Compare September 6, 2023 19:32
@matias9927 matias9927 marked this pull request as ready for review September 6, 2023 21:01
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 6, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2023

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Sep 6, 2023

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

8292692: Move MethodCounters inline functions out of method.hpp

Reviewed-by: iklam, ccheung, kvn

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

  • b408a82: 8314260: Unable to load system libraries on Windows when using a SecurityManager
  • 726c9c9: 8315735: VerifyError when switch statement used with synchronized block
  • fd6442c: 8315602: Open source swing security manager test
  • e22eb06: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
  • 9887cd8: 8315751: RandomTestBsi1999 fails often with timeouts on Linux ppc64le
  • 8107eab: 8314121: test tools/jpackage/share/RuntimePackageTest.java#id0 fails on RHEL8
  • ab28300: 8315698: Crash when comparing BasicType as int after JDK-8310577
  • b05198a: 8315600: Open source few more headless Swing misc tests
  • 4127fbb: 8315606: Open source few swing text/html tests
  • 9402548: 8268719: Force execution (and source) code page used when compiling on Windows
  • ... and 15 more: https://git.openjdk.org/jdk/compare/1f4cdb327f46085d3134d1d1164fccac35904566...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 6, 2023
Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Looks good. Just one nit.

mcs->clear_number_of_breakpoints();
}
}
#endif
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion:
#endif // INCLUDE_JVMTI

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Looks good. I submitted tier1 testing which includes different builds (I don't see link to testing in RFE).

@matias9927
Copy link
Contributor Author

Thank you for the reviews @calvinccheung, @iklam, and @vnkozlov!
/integrate

@openjdk
Copy link

openjdk bot commented Sep 7, 2023

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

  • 9bf3dee: 8314831: NMT tests ignore vm flags
  • b74805d: 8315863: [GHA] Update checkout action to use v4
  • 1cae0f5: 8315220: Event NativeLibraryLoad breaks invariant by taking a stacktrace when thread is in state _thread_in_native
  • 8f7e29b: 8313422: test/langtools/tools/javac 144 test classes uses com.sun.tools.classfile library
  • 8557205: 8312569: RISC-V: Missing intrinsics for Math.ceil, floor, rint
  • 2fd870a: 8315444: Convert test/jdk/tools to Classfile API
  • 81f8c57: 8314632: Intra-case dominance check fails in the presence of a guard
  • b408a82: 8314260: Unable to load system libraries on Windows when using a SecurityManager
  • 726c9c9: 8315735: VerifyError when switch statement used with synchronized block
  • fd6442c: 8315602: Open source swing security manager test
  • ... and 22 more: https://git.openjdk.org/jdk/compare/1f4cdb327f46085d3134d1d1164fccac35904566...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 7, 2023

@matias9927 Pushed as commit 683672c.

💡 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
Development

Successfully merging this pull request may close these issues.

4 participants