-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8340416: Remove ArchiveBuilder::estimate_archive_size() #21931
Conversation
👋 Welcome back szaldana! A progress list of the required criteria for merging this PR into |
@SoniaZaldana 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 43 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 |
@SoniaZaldana The following label will be automatically applied to this pull request:
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. |
@SoniaZaldana This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
@SoniaZaldana this pull request can not be integrated into git checkout JDK-8340416
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
@SoniaZaldana This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
address ArchiveBuilder::reserve_buffer() { | ||
size_t buffer_size = estimate_archive_size(); | ||
size_t buffer_size = CompressedClassSpaceSize; |
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.
CompressedClassSpaceSize is 1G by default. On 32-bit platforms, it may be difficult to reserve that much space. I think we should do this:
size_t buffer_size = LP64_ONLY() NOT_LP64(256 * M);
The 256M size is close to how much we were reserving on 32-bit.
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 @iklam ! I made the changes.
/open |
@SoniaZaldana This pull request is now open |
Please remove these members from ArchiveBuilder as well.
|
Hi @iklam
Thanks for the pointer! I took a closer look at
They appear to only be set in preparation for Thanks! |
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.
Looks good to me. I ran tiers 1-4 and builds-tier5 on our CI and all tests passed.
/reviewers 2 |
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.
Looks good. Thanks!
/integrate |
Thank you for the reviews! @calvinccheung @iklam |
Going to push as commit 254e840.
Your commit was automatically rebased without conflicts. |
@SoniaZaldana Pushed as commit 254e840. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Hi folks,
This PR removes ArchiveBuilder::estimate_archive_size() per the issues raised in JDK-8340416.
Thanks!
Sonia
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21931/head:pull/21931
$ git checkout pull/21931
Update a local copy of the PR:
$ git checkout pull/21931
$ git pull https://git.openjdk.org/jdk.git pull/21931/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 21931
View PR using the GUI difftool:
$ git pr show -t 21931
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21931.diff
Using Webrev
Link to Webrev Comment