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

8255001: Move G1PeriodicGCTask to its own file #1471

Closed

Conversation

@kstefanj
Copy link
Contributor

@kstefanj kstefanj commented Nov 26, 2020

After making the service thread task based it is now possible to move the tasks out of g1ServiceThread.cpp. The periodic task is moved to its own files and the initialization and registration with the service thread is done while initializing G1CollectedHeap.

No functionality is changed for the task, but it has been split up into a header and a source file.

Testing
tier 1-2 + manual testing setting G1PeriodicGCInterval through jcmd.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

Linux additional Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (8/8 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) (1/2 failed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Failed test task

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1471/head:pull/1471
$ git checkout pull/1471

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 26, 2020

👋 Welcome back sjohanss! 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.

Loading

@openjdk openjdk bot added the rfr label Nov 26, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 26, 2020

@kstefanj The following label will be automatically applied to this pull request:

  • hotspot-gc

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.

Loading

@openjdk openjdk bot added the hotspot-gc label Nov 26, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 26, 2020

Webrevs

Loading

#include "gc/g1/g1ServiceThread.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/ticks.hpp"

Copy link
Contributor

@tschatzl tschatzl Nov 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the g1ServiceThread include seems to be required here. The others can be moved to the cpp file.

Loading

Copy link
Contributor Author

@kstefanj kstefanj Nov 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, move the #include "utilities/globalDefinitions.hpp" to the cpp file, tick.hpp was not needed.

Loading

Copy link
Contributor

@tschatzl tschatzl Nov 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Nov 27, 2020

@kstefanj this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8255001-move-periodic-gc-task
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

Loading

@openjdk openjdk bot removed the merge-conflict label Nov 27, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 27, 2020

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

8255001: Move G1PeriodicGCTask to its own file

Reviewed-by: tschatzl, lkorinth

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:

  • c071960: 8257083: Security infra test failures caused by JDK-8202343
  • 4db05e9: 8254042: gtest/GTestWrapper.java failed os.test_random
  • 962f7a3: 8257162: Initialize ThreadLocalAllocBuffer members
  • 337d7bc: 8257165: C2: Improve box elimination for vector masks and shuffles
  • 4e55d0f: 8257057: C2: Improve safepoint processing during vector scalarization pass
  • e77aed6: 8256754: Deoptimization::revoke_for_object_deoptimization: stack processing start call is redundant
  • 738efea: 8248564: JFR: Remote Recording Stream
  • 9bcd269: 8257221: C2: RegMask::is_bound_set split set handling broken since JDK-8221404
  • 222e943: 8257238: Cleanup include directives for precompiled.hpp
  • fdee70d: 8257237: Cleanup unused imports in the SunJSSE provider implementation
  • ... and 16 more: https://git.openjdk.java.net/jdk/compare/20525d2110a7bb028610a2a4dac53f3c02365e49...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.

Loading

@openjdk openjdk bot added the ready label Nov 27, 2020
Copy link
Contributor

@lkorinth lkorinth left a comment

Looks good to me.

Loading

@kstefanj
Copy link
Contributor Author

@kstefanj kstefanj commented Nov 30, 2020

Thanks @tschatzl and @lkorinth for the reviews.
/integrate

Loading

@openjdk openjdk bot closed this Nov 30, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 30, 2020

@kstefanj Since your change was applied there have been 29 commits pushed to the master branch:

  • 8aaee53: 8256187: [TEST_BUG] Automate bug4275046.java test
  • a3e1980: 8256541: Sort out what version of awk is used in the build system
  • e3abe51: 8257418: C2: Rename barrier data member in MemNode and LoadStoreNode
  • c071960: 8257083: Security infra test failures caused by JDK-8202343
  • 4db05e9: 8254042: gtest/GTestWrapper.java failed os.test_random
  • 962f7a3: 8257162: Initialize ThreadLocalAllocBuffer members
  • 337d7bc: 8257165: C2: Improve box elimination for vector masks and shuffles
  • 4e55d0f: 8257057: C2: Improve safepoint processing during vector scalarization pass
  • e77aed6: 8256754: Deoptimization::revoke_for_object_deoptimization: stack processing start call is redundant
  • 738efea: 8248564: JFR: Remote Recording Stream
  • ... and 19 more: https://git.openjdk.java.net/jdk/compare/20525d2110a7bb028610a2a4dac53f3c02365e49...master

Your commit was automatically rebased without conflicts.

Pushed as commit 02ba519.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Loading

@kstefanj kstefanj deleted the 8255001-move-periodic-gc-task branch May 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants