From d2ba8a75ef0a2bbc078df1a101235a05b6e70787 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 7 Jan 2005 11:32:07 +0000 Subject: re PR libgcj/18115 (JNI nio buffer functions only work with byte buffers) 2005-01-07 Michael Koch PR libgcj/18115 * java/nio/Buffer.java (address): New field. * java/nio/DirectByteBufferImpl.java (address): Removed. * java/nio/MappedByteBufferImpl.java (address): Likewise. * java/nio/CharViewBufferImpl.java (CharViewBufferImpl): Explicitly initialize Buffer.address if needed. * java/nio/DoubleViewBufferImpl.java (DoubleViewBufferImpl): Likewise. * java/nio/FloatViewBufferImpl.java (FloatViewBufferImpl): Likewise. * java/nio/IntViewBufferImpl.java (IntViewBufferImpl): Likewise. * java/nio/LongViewBufferImpl.java (LongViewBufferImpl): Likewise. * java/nio/ShortViewBufferImpl.java (ShortViewBufferImpl): Likewise. * jni.cc (_Jv_JNI_GetDirectBufferAddress): Don't assume buffer is a DirectByteBufferImpl object. (_Jv_JNI_GetDirectBufferCapacity): Likewise. * testsuite/libjava.jni/directbuffer.c, testsuite/libjava.jni/directbuffer.java, testsuite/libjava.jni/directbuffer.out, testsuite/libjava.jni/bytebuffer.c, testsuite/libjava.jni/bytebuffer.java, testsuite/libjava.jni/bytebuffer.out: New files. From-SVN: r93046 --- libjava/java/nio/Buffer.java | 6 ++++++ libjava/java/nio/CharViewBufferImpl.java | 4 ++++ libjava/java/nio/DirectByteBufferImpl.java | 1 - libjava/java/nio/DoubleViewBufferImpl.java | 4 ++++ libjava/java/nio/FloatViewBufferImpl.java | 4 ++++ libjava/java/nio/IntViewBufferImpl.java | 4 ++++ libjava/java/nio/LongViewBufferImpl.java | 4 ++++ libjava/java/nio/MappedByteBufferImpl.java | 1 - libjava/java/nio/ShortViewBufferImpl.java | 4 ++++ 9 files changed, 30 insertions(+), 2 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/nio/Buffer.java b/libjava/java/nio/Buffer.java index f86829b..dff7f60 100644 --- a/libjava/java/nio/Buffer.java +++ b/libjava/java/nio/Buffer.java @@ -38,12 +38,18 @@ exception statement from your version. */ package java.nio; +import gnu.gcj.RawData; + +/** + * @since 1.4 + */ public abstract class Buffer { int cap = 0; int limit = 0; int pos = 0; int mark = -1; + RawData address; /** * Creates a new Buffer. diff --git a/libjava/java/nio/CharViewBufferImpl.java b/libjava/java/nio/CharViewBufferImpl.java index 3c02108..2701983 100644 --- a/libjava/java/nio/CharViewBufferImpl.java +++ b/libjava/java/nio/CharViewBufferImpl.java @@ -53,6 +53,8 @@ class CharViewBufferImpl extends CharBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ class CharViewBufferImpl extends CharBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java index d73f090..c272bac 100644 --- a/libjava/java/nio/DirectByteBufferImpl.java +++ b/libjava/java/nio/DirectByteBufferImpl.java @@ -55,7 +55,6 @@ abstract class DirectByteBufferImpl extends ByteBuffer * memory and should free it. */ private final Object owner; - final RawData address; final static class ReadOnly extends DirectByteBufferImpl { diff --git a/libjava/java/nio/DoubleViewBufferImpl.java b/libjava/java/nio/DoubleViewBufferImpl.java index d23b14a..276e275 100644 --- a/libjava/java/nio/DoubleViewBufferImpl.java +++ b/libjava/java/nio/DoubleViewBufferImpl.java @@ -53,6 +53,8 @@ final class DoubleViewBufferImpl extends DoubleBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public DoubleViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class DoubleViewBufferImpl extends DoubleBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** diff --git a/libjava/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java index 40b7339..3dd0736 100644 --- a/libjava/java/nio/FloatViewBufferImpl.java +++ b/libjava/java/nio/FloatViewBufferImpl.java @@ -53,6 +53,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** diff --git a/libjava/java/nio/IntViewBufferImpl.java b/libjava/java/nio/IntViewBufferImpl.java index 1f3f934..ff8b27b 100644 --- a/libjava/java/nio/IntViewBufferImpl.java +++ b/libjava/java/nio/IntViewBufferImpl.java @@ -53,6 +53,8 @@ final class IntViewBufferImpl extends IntBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public IntViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class IntViewBufferImpl extends IntBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** diff --git a/libjava/java/nio/LongViewBufferImpl.java b/libjava/java/nio/LongViewBufferImpl.java index 8762578..bfa64d0a 100644 --- a/libjava/java/nio/LongViewBufferImpl.java +++ b/libjava/java/nio/LongViewBufferImpl.java @@ -53,6 +53,8 @@ final class LongViewBufferImpl extends LongBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public LongViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class LongViewBufferImpl extends LongBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java index bc8ee80..63e0225 100644 --- a/libjava/java/nio/MappedByteBufferImpl.java +++ b/libjava/java/nio/MappedByteBufferImpl.java @@ -45,7 +45,6 @@ import java.io.IOException; final class MappedByteBufferImpl extends MappedByteBuffer { boolean readOnly; - RawData address; /** Posix uses this for the pointer returned by mmap; * Win32 uses it for the pointer returned by MapViewOfFile. */ diff --git a/libjava/java/nio/ShortViewBufferImpl.java b/libjava/java/nio/ShortViewBufferImpl.java index a9d086d..acd6c23 100644 --- a/libjava/java/nio/ShortViewBufferImpl.java +++ b/libjava/java/nio/ShortViewBufferImpl.java @@ -53,6 +53,8 @@ final class ShortViewBufferImpl extends ShortBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public ShortViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class ShortViewBufferImpl extends ShortBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** -- cgit v1.1