-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8296158: Refactor the verification of CDS region checksum #12424
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
Conversation
👋 Welcome back iklam! A progress list of the required criteria for merging this PR into |
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.
Code refactoring looks good.
@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 4 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
src/hotspot/share/cds/filemap.cpp
Outdated
// This function should be called after the region has been properly | ||
// loaded into memory via FileMapInfo::map_region() or FileMapInfo::read_region(). | ||
// I.e., this->mapped_base() must be valid. | ||
if (!VerifySharedSpaces) { |
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.
While I think this is a nice shortcut to avoid checking VerifySharedSpaces, I think it occludes the fact it is a necessary condition in the if statements below. Just my 2 cents but I think it is more intuitive to keep if (VerifySharesSpaces && !check_region_crc())
and keep an assert inside this method.
Either way does work, so go with what you think makes the most sense. Other than that, LGTM!
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.
Thanks for the comment. I fixed the code as you suggested.
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!
Thanks @matias9927 and @calvinccheung for the review |
Going to push as commit 49eb68b.
Your commit was automatically rebased without conflicts. |
Consolidate the two old functions
FileMapInfo::region_crc_check(char* buf, size_t size, int expected_crc)
FileMapInfo::verify_region_checksum(int i)
Into a single function
FileMapRegion::check_region_crc()
.Also performed some minor renaming and removed a useless API.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12424/head:pull/12424
$ git checkout pull/12424
Update a local copy of the PR:
$ git checkout pull/12424
$ git pull https://git.openjdk.org/jdk pull/12424/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 12424
View PR using the GUI difftool:
$ git pr show -t 12424
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12424.diff