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

(0.48) -agentpath: libraries require no path/name decoration & Refactor a few CRIU APIs to take J9JavaVM* instead of J9VMThread* #20287

Merged

Conversation

JasonFengJ9
Copy link
Member

-agentpath: libraries require no path/name decoration

The agent library specified via -agentpath: has an absolute path/name, it should not be decorated again during the agent library loading;
For -agentpath: option in the restore option file, compare the actual platform-dependent library name.

Cherry-pick

Refactor a few CRIU APIs to take J9JavaVM* instead of J9VMThread*

The currentThread passed into isCRaCorCRIUSupportEnabled(J9VMThread*), isCheckpointAllowed(J9VMThread*) and
isDebugOnRestoreEnabled(J9VMThread*) are just for redirection of currentThread->javaVM, changed the APIs to take J9JavaVM* directly.

Cherry-pick

Note: these two PRs were in last night's builds, and no failure seems related to those changes.

In addition, there were merging conflicts, verified in a personal build JDK17_x86-64_linux.

Signed-off-by: Jason Feng [email protected]

The currentThread passed into isCRaCorCRIUSupportEnabled(J9VMThread*),
isCheckpointAllowed(J9VMThread*) and
isDebugOnRestoreEnabled(J9VMThread*) are just for redirection of
currentThread->javaVM, changed the APIs to take J9JavaVM* directly.

Signed-off-by: Jason Feng <[email protected]>
The agent library specified via -agentpath: has an absolute path/name,
it should not be decorated again during the agent library loading;
For -agentpath: option in the restore option file, compare the actual
platform-dependent library name.

Signed-off-by: Jason Feng <[email protected]>
@keithc-ca
Copy link
Contributor

Is the failure in https://openj9-jenkins.osuosl.org/job/Test_openjdk11_j9_extended.system_aarch64_mac_Release/86/ related to the #20202? If we think so, that should be fixed before propagating to the 0.48 release branch.

@JasonFengJ9
Copy link
Member Author

11:31:32  JVMT stderr JVMJ9TI001E Agent library /Users/jenkins/workspace/Test_openjdk11_j9_extended.system_aarch64_mac_Release_testList_0/jvmtest/system/openj9-systemtest/openj9.test.sharedClasses.jvmti/bin/native/osx/libsharedClasses.so could not be opened (dlopen(/Users/jenkins/workspace/Test_openjdk11_j9_extended.system_aarch64_mac_Release_testList_0/jvmtest/system/openj9-systemtest/openj9.test.sharedClasses.jvmti/bin/native/osx/liblibsharedClasses.so.dylib, 0x0001): tried: '/Users/jenkins/workspace/Test_openjdk11_j9_extended.system_aarch64_mac_Release_testList_0/jvmtest/system/openj9-systemtest/openj9.test.sharedClasses.jvmti/bin/native/osx/liblibsharedClasses.so.dylib' (no such file))

This is to be fixed by this PR in 0.48.

@keithc-ca
Copy link
Contributor

@JasonFengJ9
Copy link
Member Author

https://openj9-jenkins.osuosl.org/job/Test_openjdk11_j9_extended.system_aarch64_mac_Release/86/

-agentpath:/Users/jenkins/workspace/Test_openjdk11_j9_extended.system_aarch64_mac_Release_testList_0/jvmtest/system/openj9-systemtest/openj9.test.sharedClasses.jvmti/bin/native/osx/libsharedClasses.so=expectedCacheCount=5,deleteCaches=true,cachePrefix=DefaultLocGrpAccessJVMTI

liblibsharedClasses.so.dylib

The wrong library name was due to additional decoration introduced by #19754 which was merged into 0.48 this morning, the build was launched afterwards but w/o this PR.
This PR is to fix that problem for -agentpath.

@keithc-ca
Copy link
Contributor

keithc-ca commented Oct 2, 2024

I think adoptium/openj9-systemtest#158 is needed to fix that failure.

@pshipton
Copy link
Member

pshipton commented Oct 2, 2024

The problem seen in https://openj9-jenkins.osuosl.org/job/Test_openjdk11_j9_extended.system_aarch64_mac_Release/86/ was fixed in the head stream via #20202

@keithc-ca keithc-ca merged commit 591c050 into eclipse-openj9:v0.48.0-release Oct 2, 2024
2 checks passed
@JasonFengJ9 JasonFengJ9 deleted the agentpath-0.48 branch October 2, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants