Update JVM_CopySwapMemory for off-heap enabled case #20742
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The java caller has added Unsafe.arrayBaseOffset() to the offset for JVM_CopySwapMemory JNI API, need to remove it as GetPrimitiveArrayCritical returns a pointer to the first element, need to replace J9VMTHREAD_CONTIGUOUS_INDEXABLE_HEADER_SIZE() with J9VMTHREAD_UNSAFE_INDEXABLE_HEADER_SIZE() for off-heap case, because arrayBaseOffset() == 0 when off-heap is enabled. Signed-off-by: lhu <[email protected]>
|
@amicic @dmitripivkine please review the changes, Thanks |
Merged
amicic
reviewed
Dec 3, 2024
| @@ -129,15 +129,15 @@ JVM_CopySwapMemory(JNIEnv *env, jobject srcObj, jlong srcOffset, jobject dstObj, | |||
| /* The java caller has added Unsafe.arrayBaseOffset() to the offset. Remove it | |||
| * here as GetPrimitiveArrayCritical returns a pointer to the first element. | |||
| */ | |||
| srcOffset -= J9VMTHREAD_CONTIGUOUS_INDEXABLE_HEADER_SIZE((J9VMThread*)env); | |||
| srcOffset -= J9VMTHREAD_UNSAFE_INDEXABLE_HEADER_SIZE((J9VMThread*)env); | |||
There was a problem hiding this comment.
not sure what's preferred, but wonder if can you call VM_UnsafeAPI::arrayBase() instead
There was a problem hiding this comment.
We cant use the C++ API in C files.
|
looks ok to me, but I think someone from VM team should approve/merge it |
tajila
approved these changes
Dec 4, 2024
|
jenkins test sanity alinux64 jdk21 |
amicic
approved these changes
Dec 4, 2024
|
@LinHu2016 does this need to go into 0.49? |
|
No need, the 2 values will only differ once offheap is enabled. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The java caller has added Unsafe.arrayBaseOffset() to the offset for JVM_CopySwapMemory JNI API, need to remove it as GetPrimitiveArrayCritical returns a pointer to the first element, need to replace J9VMTHREAD_CONTIGUOUS_INDEXABLE_HEADER_SIZE() with J9VMTHREAD_UNSAFE_INDEXABLE_HEADER_SIZE() for off-heap case, because arrayBaseOffset() == 0 when off-heap is enabled.