Skip to content

Commit

Permalink
Avoid double module trace registration after CRIU move to java.base
Browse files Browse the repository at this point in the history
This patch fixes eclipse-openj9#18800.
When the CRIUSupport APIs were moved into java.base, the line that
previously registered the j9criu module for tracing was not removed.
Therefore, the j9vm module is being double registered, causing
downstream effects in the tracing mechanism. This patch removes
the registration during the CRIU API setup phase.

Issues: eclipse-openj9#18800
Signed-off-by: Nathan Henderson <nathan.henderson@ibm.com>
  • Loading branch information
ThanHenderson committed Feb 7, 2024
1 parent 01d6c8e commit b74a141
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions runtime/vm/CRIUHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,6 @@ setupJNIFieldIDsAndCRIUAPI(JNIEnv *env, jclass *currentExceptionClass, IDATA *sy
PORT_ACCESS_FROM_VMC(currentThread);
IDATA libCRIUReturnCode = 0;

UT_MODULE_LOADED(J9_UTINTERFACE_FROM_VM(vm));

criuJVMCheckpointExceptionClass = env->FindClass("openj9/internal/criu/JVMCheckpointException");
Assert_VM_criu_notNull(criuJVMCheckpointExceptionClass);
vmCheckpointState->criuJVMCheckpointExceptionClass = (jclass)env->NewGlobalRef(criuJVMCheckpointExceptionClass);
Expand Down

0 comments on commit b74a141

Please sign in to comment.