-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
8282729: Serial: Move BOT implementation to collector specific directory #9662
Conversation
👋 Welcome back xmas92! 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.
Can you check tier4/tier5, which includes the serviceability tests after these changes (just do tier1-5 to be safe).
Looks good apart from this request to rerun testing.
Passed: tier 2-5 |
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.
@xmas92 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 48 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. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@tschatzl, @albertnetymk) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
It's a bit surprising to see changes to other collectors in a commit titled "Serial: ...". I guess that's what you meant by "Move required fixing up some missing header files." I wonder if you can extract those fixes in another PR(s), which, IMO, would also make reviewing this PR slightly easier. Basically keeping each PR more focused. |
It seems a bit ugly to leave the repository in an intermediate state where some headers are included only because there is something, somewhere else, that need that include. But if it makes the review easier I'll move -#include "gc/shared/gc_globals.hpp"
-#include "memory/virtualspace.hpp" into a different issue, so G1 and Epsilons still have all their required (indirect) includes. |
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.
Thank you for the update. Now I can use git diff --color-moved=dimmed_zebra
to ignore pure "moves".
I actually think BlockOffsetTable.hpp
is better than serialBlockOffsetTable.hpp
, as it matches the type name. The counterpart would be ObjectStartArray
in the Parallel
collector, which also has a relatively long name, unlike G1.
Either way, this PR is good to go.
I agree, used that name because of the Regardless want to integrate #9921 / JDK-8292606 before this so the header files in whatever |
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.
Still good.
/integrate |
/sponsor |
Going to push as commit 0813a47.
Your commit was automatically rebased without conflicts. |
@albertnetymk @xmas92 Pushed as commit 0813a47. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Moves serial code from
share/gc/shared/blockOffsetTable.*
toshare/gc/serial/serialBlockOffsetTable.*
Move required fixing up some missing header files.
Refactoring tries to respect
INCLUDE_SERIALGC
without changing any behaviour.Given that
--disable-jvm-feature-serialgc
will not build before this change, it will not build afterwards either. However it does now compile, but will fail to link.The diff below is enough to for
make hotspot
to run (onmacosx-aarch64
), but it will not build the complete JDK as the build system will use the compiled binaries with-XX:+UseSerialGC
which obviously won't work as that GC is missing.There is still a lot of Serial only code in the shared code base. The
share/gc/shared/space.*
is a clear next candidate for refactoring as this change required a bunch of code in there to depend onINCLUDE_SERIALGC
to build.Testing: Tier 1
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9662/head:pull/9662
$ git checkout pull/9662
Update a local copy of the PR:
$ git checkout pull/9662
$ git pull https://git.openjdk.org/jdk pull/9662/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 9662
View PR using the GUI difftool:
$ git pr show -t 9662
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9662.diff