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

Tidy up CRIU support #13934

Merged
merged 1 commit into from
Nov 17, 2021
Merged

Tidy up CRIU support #13934

merged 1 commit into from
Nov 17, 2021

Conversation

keithc-ca
Copy link
Contributor

  • inline CRIU checkpoint state (only if needed)
  • add missing #endif comments

@@ -61,16 +61,17 @@ jvmCheckpointHooks(J9VMThread *currentThread)
BOOLEAN
jvmRestoreHooks(J9VMThread *currentThread)
{
#if defined(J9VM_OPT_CRIU_SUPPORT)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we put this entire function under a single #ifdef? There is no reason for this function here to be called if the CRIU flag is not enabled.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I can do that (I was just maintaining the set of functions defined).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The file is now only compiled if CRIU support is configured.

@tajila tajila requested a review from dsouzai November 16, 2021 20:28
@tajila
Copy link
Contributor

tajila commented Nov 16, 2021

Adding Irwin to review the JIT changes

Copy link
Contributor

@dsouzai dsouzai left a comment

Choose a reason for hiding this comment

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

No functional changes added to JIT, so LGTM for the JIT files.

@keithc-ca keithc-ca marked this pull request as draft November 16, 2021 21:52
* inline CRIU checkpoint state (only if needed)
* add missing #endif comments
* compile criuhelpers.cpp only if CRIU support is configured
* only declare functions when they will be defined

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@tajila tajila added criu Used to track CRIU snapshot related work comp:vm comp:jit labels Nov 17, 2021
@tajila
Copy link
Contributor

tajila commented Nov 17, 2021

Jenkins test sanity win jdk8

@tajila tajila merged commit 5bd7e26 into eclipse-openj9:master Nov 17, 2021
@keithc-ca keithc-ca deleted the criu branch November 17, 2021 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp:jit comp:vm criu Used to track CRIU snapshot related work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants