Auto-port 5.0: Fix memoryAddress() for direct ByteBuffers wrapped by Unpooled without Unsafe#16823
Merged
Merged
Conversation
…t Unsafe (#16788) Motivation: Unpooled.wrappedBuffer(ByteBuffer) behaves differently depending on whether Unsafe is available. When Unsafe is enabled, wrapping a direct ByteBuffer returns a buffer that exposes memoryAddress(): ```java ByteBuffer byteBuffer = ByteBuffer.allocateDirect(1024); ByteBuf byteBuf = Unpooled.wrappedBuffer(byteBuffer); System.out.println(byteBuf.memoryAddress()); ``` When Unsafe is disabled, the same direct ByteBuffer is wrapped by the non-unsafe path. Even if the platform can still obtain the direct buffer address through FFM, memoryAddress() throws UnsupportedOperationException. A similar inconsistency exists for the empty buffer returned by: ``` java ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer(0, 0); System.out.println(byteBuf.memoryAddress()); ``` Modification: - Use PlatformDependent.hasDirectByteBufferAddress(...) in the unpooled direct wrapper path instead of relying only on Unsafe. - Use the same address availability check when initializing EmptyByteBuf's cached direct buffer address. Result: Fixes #<GitHub issue number>. Unpooled wrapped direct buffers expose memoryAddress() consistently when platform address access is available,including when Unsafe is disabled and FFM is used Co-authored-by: Jonas Konrad <jonas.konrad@oracle.com> (cherry picked from commit f7b1b7d)
This file contains hidden or 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
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.
Auto-port of #16788 to 5.0
Cherry-picked commit: f7b1b7d
Motivation:
Unpooled.wrappedBuffer(ByteBuffer) behaves differently depending on whether Unsafe is available.
When Unsafe is enabled, wrapping a direct ByteBuffer returns a buffer that exposes memoryAddress():
When Unsafe is disabled, the same direct ByteBuffer is wrapped by the non-unsafe path. Even if the platform can still obtain the direct buffer address through FFM, memoryAddress() throws UnsupportedOperationException.
A similar inconsistency exists for the empty buffer returned by:
Modification:
Result:
Fixes #.
Unpooled wrapped direct buffers expose memoryAddress() consistently when platform address access is available,including when Unsafe is disabled and FFM is used