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

8254565: JFR: Incorrect verification of mirror events #3600

Closed
wants to merge 1 commit into from

Conversation

egahlin
Copy link
Member

@egahlin egahlin commented Apr 21, 2021

Hi,

Could I have a review of a fix that improves the verification of mirror events.

Mirror events is an internal mechanism used by JDK events that can't depend on the jdk.jfr module, today only events defined in java.base. The verification is a sanity check to make sure the field layout of the event and the mirror does not differ. The verification now verifies field type and it handles the unlikely case somebody adds a field to java.lang.Object (for experimentation) by always walking the whole class hierarchy of the mirror.

Testing: jdk/jdk/jfr

Thanks
Erik


Progress

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

Issue

  • JDK-8254565: JFR: Incorrect verification of mirror events

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3600

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 21, 2021

👋 Welcome back egahlin! 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 openjdk bot commented Apr 21, 2021

@egahlin The following label will be automatically applied to this pull request:

  • hotspot-jfr

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-jfr label Apr 21, 2021
@egahlin egahlin marked this pull request as ready for review Apr 21, 2021
@openjdk openjdk bot added the rfr label Apr 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 21, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 21, 2021

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

8254565: JFR: Incorrect verification of mirror events

Reviewed-by: mgronlun

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

  • 7146104: 8265421: java/lang/String/StringRepeat.java test is missing a memory requirement
  • b5c92ca: 8265106: IGV: Enforce en-US locale while parsing ideal graph
  • 3de0dcb: 8265483: All-caps “JAVA” in the top navigation bar
  • 739769c: 8265411: Avoid unnecessary Method::init_intrinsic_id calls
  • a22ad03: 8264983: Add gtest for JDK-8264008
  • 91b08b7: 8261779: JCK test api/javax_crypto/EncryptedPrivateKeyInfo/Ctor4.html is failing with assertion error when assertions enabled
  • 2fcd920: 8261183: Follow on to Make lists of normal filenames
  • 40ef00c: 8258457: testlibrary_tests/ctw/JarDirTest.java fails with InvalidPathException on windows
  • 3f0da35: 8261392: Exclude testlibrary_tests/ctw/JarDirTest.java
  • 8d0faaf: 8257001: Improve Http Client Support
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/d61345984d56cc46161ffea097afbd899081f3cf...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 label Apr 21, 2021
@egahlin
Copy link
Member Author

@egahlin egahlin commented Apr 21, 2021

/integrate

@openjdk openjdk bot closed this Apr 21, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 21, 2021

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

  • f45d460: 8265017: runtime/HiddenClasses/StressHiddenClasses.java timed out on Win* OCI
  • 0136c89: 8265490: Unterminated string passed to FindClass() in hotspot test
  • 325edbc: 8265450: Merge PreservedMarksSet::restore code paths
  • b337f63: 8037397: RegEx pattern matching loses character class after intersection (&&) operator
  • 07a7510: 8200145: Conditional expression mistakenly treated as standalone
  • 41fc7dd: 8199079: Test javax/swing/UIDefaults/6302464/bug6302464.java is unstable
  • 45c474a: 8168408: Test java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java fails intermittentently on windows
  • 18ee419: 8198422: Test java/awt/font/StyledMetrics/BoldSpace.java is unstable
  • da86029: 8265326: Strange Characters in G1GC GC Log
  • 7879adb: 8265343: Update Debian-based cross-compilation recipes
  • ... and 21 more: https://git.openjdk.java.net/jdk/compare/d61345984d56cc46161ffea097afbd899081f3cf...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7116321.

💡 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-jfr integrated
2 participants