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

Remove CRIU Interpreter #20177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ThanHenderson
Copy link
Contributor

@ThanHenderson ThanHenderson commented Sep 17, 2024

  • Remove CRIUBytcodeInterpreterCompressed
  • Remove CRIUBytcodeInterpreterFull
  • Add J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER flag
  • Add criuRestoreCheckForDebugInterpreterRequest hook
  • Set transition flag if -Xdump, -Xtrace, or JDWP is specified
  • checkTransitionToDebugInterpreter becomes infallible
  • Call checkTransitionToDebugInterpreter after restore hooks

Issues: #19835
Signed-off-by: Nathan Henderson [email protected]

@ThanHenderson
Copy link
Contributor Author

fyi @tajila. If we can merge #19754, I'll amend this patch with whatever is required w.r.t. #19835 (comment)

@ThanHenderson ThanHenderson added comp:vm criu Used to track CRIU snapshot related work labels Sep 17, 2024
runtime/vm/jvminit.c Outdated Show resolved Hide resolved
runtime/vm/CRIUHelpers.cpp Outdated Show resolved Hide resolved
runtime/vm/CRIUHelpers.cpp Outdated Show resolved Hide resolved
runtime/nls/j9vm/j9vm.nls Outdated Show resolved Hide resolved
@ThanHenderson
Copy link
Contributor Author

ThanHenderson commented Sep 19, 2024

I've added a criuRestoreCheckForJdwp hook that checks for -Xrunjdwp or -agentlib:jdwp= and sets J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER if either is present. I believe this is all that was alluded to by #19835 (comment). Let me know if there is any other work needing to be added here given #19754 has now been merged.

If we are good with the patch, I'll just need to add tests in test/functional/cmdLineTests/criu/src/org/openj9/criu/EnvVarFileTest.java and test/functional/cmdLineTests/criu/src/org/openj9/criu/OptionsFileTest.java for the JDWP options.

- Remove CRIUBytcodeInterpreterCompressed
- Remove CRIUBytcodeInterpreterFull
- Add J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER flag
- Add criuRestoreCheckForDebugInterpreterRequest hook
- Add criuRestoreCheckForJdwp hook
- Set transition flag if -Xdump, -Xtrace, or JDWP is specified
- checkTransitionToDebugInterpreter becomes infallible
- Call checkTransitionToDebugInterpreter after restore hooks

Issues: eclipse-openj9#19835
Signed-off-by: Nathan Henderson <[email protected]>
@ThanHenderson
Copy link
Contributor Author

Note: this will have to be double-delivered for the 0.48 release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp:vm criu Used to track CRIU snapshot related work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants