-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
8261551: Remove special CDS handling in Metaspace::allocate #3185
8261551: Remove special CDS handling in Metaspace::allocate #3185
Conversation
👋 Welcome back iklam! A progress list of the required criteria for merging this PR into |
e719f37
to
5708f5e
Compare
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
@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:
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 22 new commits pushed to the
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Ioi,
This seems fine. But I noticed that preload_and_dump doesn't let exceptions escape so should not itself be a TRAPS method (and it can be called with main_thread rather than THREAD).
Thanks,
David
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1. Nice to see this gone.
Thanks for noticing. I removed |
@@ -612,7 +612,8 @@ void MetaspaceShared::prepare_for_dumping() { | |||
|
|||
// Preload classes from a list, populate the shared spaces and dump to a | |||
// file. | |||
void MetaspaceShared::preload_and_dump(TRAPS) { | |||
void MetaspaceShared::preload_and_dump() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would have kept the Thread argument to avoid the implicit Thread::current() in EXCEPTION_MARK. But it is a margin call either way.
Thanks @tstuefe @dholmes-ora @yminqi for the review. |
@iklam Since your change was applied there have been 23 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit 41657b1. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Please review this simple patch to remove the special handling of OOM conditions inside
Metaspace::allocate()
for CDS archive dumping. Now the OOM exception will be thrown normally and will be handled byMetaspaceShared::preload_and_dump()
andClassListParser::parse()
.Progress
Issue
Reviewers
Download
To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3185/head:pull/3185
$ git checkout pull/3185
To update a local copy of the PR:
$ git checkout pull/3185
$ git pull https://git.openjdk.java.net/jdk pull/3185/head