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

8288064: Class initialization locking #9141

Closed
wants to merge 3 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 13, 2022

Use a native JVM monitor and state for mutual exclusion for class linking and initialization. See CR for more details.
Tested with tier1-8. tiers 1-4 on Oracle supported platforms and 5-8 on linux-x64-debug. There isn't any platform dependent code in this change.


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/9141/head:pull/9141
$ git checkout pull/9141

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9141

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2022

👋 Welcome back coleenp! 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 openjdk bot added the rfr Pull request is ready for review label Jun 13, 2022
@openjdk
Copy link

openjdk bot commented Jun 13, 2022

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

  • hotspot
  • serviceability

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 labels Jun 13, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2022

Webrevs

Copy link
Contributor

@robehn robehn 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 to me, just make sure it passes JCK.

@openjdk
Copy link

openjdk bot commented Jun 14, 2022

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

8288064: Class initialization locking

Reviewed-by: rehn, vlivanov

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

  • d5cd2f2: 8284849: Add deoptimization to unified logging
  • dfeeb6f: 8288140: Avoid redundant Hashtable.get call in Signal.handle
  • 68b2057: 8287373: remove unnecessary paddings in generated code
  • 2471f8f: 8287647: VM debug support: find node by pattern in name or dump
  • 33f34d5: 8288207: Enhance MalformedURLException in Uri.parseCompat
  • 444a0d9: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • 08400f1: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
  • fe80721: 8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
  • bbaeacb: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
  • 0f58097: 8288134: Super class names don't have envelopes
  • ... and 16 more: https://git.openjdk.org/jdk/compare/8f400b9aab57d0639721add2ba511bfc0459bd89...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 Jun 14, 2022
@coleenp
Copy link
Contributor Author

coleenp commented Jun 14, 2022

Thanks Robbin. yes it passes the JCK both locally and in our mach5 test system.

Copy link

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

@coleenp
Copy link
Contributor Author

coleenp commented Jun 14, 2022

Thanks Vladimir and thank you for your help with the CodeCache::flush_dependencies() logic.

@coleenp
Copy link
Contributor Author

coleenp commented Jun 15, 2022

Thanks David for your comments. I pushed an update and retested with jck tests.

@coleenp
Copy link
Contributor Author

coleenp commented Jun 16, 2022

Tests in tier1-4 pass with this new assert, which we expected. @dholmes-ora told me offline these were drive-by comments and I've made the suggested changes. Thanks David.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 16, 2022

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

  • 3d12c02: Merge
  • 729164f: 8288533: Missing @param tags in com.sun.source classes
  • 9254e12: 8288526: ProblemList gc/stress/TestStressG1Humongous.java on windows-x64
  • 395aea3: 8288414: Long::compress/expand samples are not correct
  • f3b1f60: 8288289: Preview APIs in jdk.jdi, jdk.management, and jdk.jfr should be reflective preview APIs
  • 31bc689: 8288324: Loom: Uninitialized JvmtiEnvs in VM_Virtual* ops
  • 50f99c3: 8288360: CI: ciInstanceKlass::implementor() is not consistent for well-known classes
  • 5a8e1e4: 8287889: (fs) Files.copy description of REPLACE_EXISTING is hard to read
  • 8cd87e7: 8288303: C1: Miscompilation due to broken Class.getModifiers intrinsic
  • c76a06a: 8288214: serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java test failed
  • ... and 39 more: https://git.openjdk.org/jdk/compare/8f400b9aab57d0639721add2ba511bfc0459bd89...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 16, 2022
@openjdk openjdk bot closed this Jun 16, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 16, 2022
@coleenp coleenp deleted the init-lock branch June 16, 2022 12:38
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 16, 2022
@openjdk
Copy link

openjdk bot commented Jun 16, 2022

@coleenp Pushed as commit cf4a496.

💡 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
4 participants