This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [Patch] JNI support for direct buffers
Am Donnerstag, 6. Januar 2005 22:31 schrieb Michael Koch:
> Am Donnerstag, 6. Januar 2005 11:24 schrieb Michael Koch:
> > Am Donnerstag, 6. Januar 2005 09:38 schrieb Michael Koch:
> > > Hi list,
> > >
> > >
> > > I wrote the attached patch to fix the handling of direct
> > > buffers when using the JNI methods NewDirectByteBuffer,
> > > GetDirectBufferAddress and GetDirectBufferLength.
>
> This patch fixes PR libgcj/18115 by returning the correct address
> or NULL and the correct capacity or -1 in all cases now.
>
> > > OK to commit to trunk ?
> >
> > There was little bug in the testsuite part of the patch. Here is
> > the new patch.
>
> I found another case that was broken in our implementation. I added
> another testcase for it and fixed it.
>
> Ok to commit ?
After a discussion on irc with Bryce McKinley I added two additional
checks into the implementations of GetDirectBufferAddress and
GetDirectBufferLength. New patch attached.
Ok to commit ?
Michael
2005-01-07 Michael Koch <konqueror@gmx.de>
* java/nio/Buffer.java
(address): New field.
* java/nio/DirectByteBufferImpl.java
(address): Removed.
* java/nio/MappedByteBufferImpl.java
(address): Likewise..
* java/nio/CharViewBufferImpl.java
(CharViewBufferImpl): Explicitely 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.
--
Homepage: http://www.worldforge.org/
Index: java/nio/Buffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/Buffer.java,v
retrieving revision 1.10
diff -u -r1.10 Buffer.java
--- java/nio/Buffer.java 22 Oct 2004 17:14:14 -0000 1.10
+++ java/nio/Buffer.java 7 Jan 2005 05:37:14 -0000
@@ -38,12 +38,18 @@
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.
Index: java/nio/CharViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/CharViewBufferImpl.java,v
retrieving revision 1.4
diff -u -r1.4 CharViewBufferImpl.java
--- java/nio/CharViewBufferImpl.java 9 Jul 2004 13:40:28 -0000 1.4
+++ java/nio/CharViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: java/nio/DirectByteBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/DirectByteBufferImpl.java,v
retrieving revision 1.16
diff -u -r1.16 DirectByteBufferImpl.java
--- java/nio/DirectByteBufferImpl.java 24 Nov 2004 12:19:42 -0000 1.16
+++ java/nio/DirectByteBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -55,7 +55,6 @@
* memory and should free it.
*/
private final Object owner;
- final RawData address;
final static class ReadOnly extends DirectByteBufferImpl
{
Index: java/nio/DoubleViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/DoubleViewBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 DoubleViewBufferImpl.java
--- java/nio/DoubleViewBufferImpl.java 9 Jul 2004 13:40:28 -0000 1.5
+++ java/nio/DoubleViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: java/nio/FloatViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/FloatViewBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 FloatViewBufferImpl.java
--- java/nio/FloatViewBufferImpl.java 9 Jul 2004 13:40:29 -0000 1.5
+++ java/nio/FloatViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: java/nio/IntViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/IntViewBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 IntViewBufferImpl.java
--- java/nio/IntViewBufferImpl.java 9 Jul 2004 13:40:29 -0000 1.5
+++ java/nio/IntViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: java/nio/LongViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/LongViewBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 LongViewBufferImpl.java
--- java/nio/LongViewBufferImpl.java 9 Jul 2004 13:40:29 -0000 1.5
+++ java/nio/LongViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: java/nio/MappedByteBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/MappedByteBufferImpl.java,v
retrieving revision 1.14
diff -u -r1.14 MappedByteBufferImpl.java
--- java/nio/MappedByteBufferImpl.java 24 Nov 2004 11:11:46 -0000 1.14
+++ java/nio/MappedByteBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -45,7 +45,6 @@
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. */
Index: java/nio/ShortViewBufferImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/ShortViewBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ShortViewBufferImpl.java
--- java/nio/ShortViewBufferImpl.java 9 Jul 2004 13:40:29 -0000 1.5
+++ java/nio/ShortViewBufferImpl.java 7 Jan 2005 05:37:14 -0000
@@ -53,6 +53,8 @@
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 @@
this.offset = offset;
this.readOnly = readOnly;
this.endian = endian;
+ if (bb.isDirect())
+ this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset);
}
/**
Index: jni.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni.cc,v
retrieving revision 1.91
diff -u -r1.91 jni.cc
--- jni.cc 25 Nov 2004 03:46:56 -0000 1.91
+++ jni.cc 7 Jan 2005 05:37:14 -0000
@@ -41,6 +41,7 @@
#include <java/lang/ThreadGroup.h>
#include <java/lang/Thread.h>
#include <java/lang/IllegalAccessError.h>
+#include <java/nio/Buffer.h>
#include <java/nio/DirectByteBufferImpl.h>
#include <java/nio/DirectByteBufferImpl$ReadWrite.h>
#include <java/util/IdentityHashMap.h>
@@ -1733,16 +1734,22 @@
_Jv_JNI_GetDirectBufferAddress (JNIEnv *, jobject buffer)
{
using namespace java::nio;
- DirectByteBufferImpl* bb = static_cast<DirectByteBufferImpl *> (buffer);
- return reinterpret_cast<void *> (bb->address);
+ if (! _Jv_IsInstanceOf (buffer, &Buffer::class$))
+ return NULL;
+ Buffer *tmp = static_cast<Buffer *> (buffer);
+ return reinterpret_cast<void *> (tmp->address);
}
static jlong JNICALL
_Jv_JNI_GetDirectBufferCapacity (JNIEnv *, jobject buffer)
{
using namespace java::nio;
- DirectByteBufferImpl* bb = static_cast<DirectByteBufferImpl *> (buffer);
- return bb->capacity();
+ if (! _Jv_IsInstanceOf (buffer, &Buffer::class$))
+ return -1;
+ Buffer *tmp = static_cast<Buffer *> (buffer);
+ if (tmp->address == NULL)
+ return -1;
+ return tmp->capacity();
}
Index: testsuite/libjava.jni/directbuffer.c
===================================================================
RCS file: testsuite/libjava.jni/directbuffer.c
diff -N testsuite/libjava.jni/directbuffer.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/directbuffer.c 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,75 @@
+#include <stdlib.h>
+
+#include "directbuffer.h"
+
+#define BUFFER_SIZE 1024
+
+static void *address;
+
+JNIEXPORT jobject JNICALL
+Java_directbuffer_createDirectByteBuffer (JNIEnv *env, jclass k)
+{
+ address = malloc (BUFFER_SIZE);
+ return (*env)->NewDirectByteBuffer (env, address, 1024);
+}
+
+static void
+test_buffer (JNIEnv *env, jobject buffer, const char *name, int len)
+{
+ void *tmp = (*env)->GetDirectBufferAddress (env, buffer);
+
+ if (address == tmp)
+ printf ("PASS: address of %s\n", name);
+ else
+ printf ("FAIL: address of %s\n", name);
+
+ int tmplen = (*env)->GetDirectBufferCapacity (env, buffer);
+
+ if (len == tmplen)
+ printf ("PASS: length of %s\n", name);
+ else
+ printf ("FAIL: length of %s\n", name);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testDirectByteBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "direct java.nio.ByteBuffer", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testCharBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.CharBuffer view", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testDoubleBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.DoubleBuffer view", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testFloatBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.FloatBuffer view", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testIntBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.IntBuffer view", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testLongBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.LongBuffer view", len);
+}
+
+JNIEXPORT void JNICALL
+Java_directbuffer_testShortBuffer (JNIEnv *env, jclass k, jobject buffer, jint len)
+{
+ test_buffer (env, buffer, "java.nio.ShortBuffer view", len);
+}
+
Index: testsuite/libjava.jni/directbuffer.java
===================================================================
RCS file: testsuite/libjava.jni/directbuffer.java
diff -N testsuite/libjava.jni/directbuffer.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/directbuffer.java 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,40 @@
+// Test to make sure JNI implementation catches exceptions.
+
+import java.nio.*;
+
+public class directbuffer
+{
+ static
+ {
+ System.loadLibrary("directbuffer");
+ }
+
+ public static native ByteBuffer createDirectByteBuffer();
+
+ public static native void testDirectByteBuffer(ByteBuffer bb, int len);
+ public static native void testCharBuffer(CharBuffer b, int len);
+ public static native void testDoubleBuffer(DoubleBuffer b, int len);
+ public static native void testFloatBuffer(FloatBuffer b, int len);
+ public static native void testIntBuffer(IntBuffer b, int len);
+ public static native void testLongBuffer(LongBuffer b, int len);
+ public static native void testShortBuffer(ShortBuffer b, int len);
+
+ public static void main(String[] args)
+ {
+ ByteBuffer bb = createDirectByteBuffer();
+ CharBuffer cb = bb.asCharBuffer();
+ DoubleBuffer db = bb.asDoubleBuffer();
+ FloatBuffer fb = bb.asFloatBuffer();
+ IntBuffer ib = bb.asIntBuffer();
+ LongBuffer lb = bb.asLongBuffer();
+ ShortBuffer sb = bb.asShortBuffer();
+
+ testDirectByteBuffer(bb, 1024);
+ testCharBuffer(cb, 512);
+ testDoubleBuffer(db, 128);
+ testFloatBuffer(fb, 256);
+ testIntBuffer(ib, 256);
+ testLongBuffer(lb, 128);
+ testShortBuffer(sb, 512);
+ }
+}
Index: testsuite/libjava.jni/directbuffer.out
===================================================================
RCS file: testsuite/libjava.jni/directbuffer.out
diff -N testsuite/libjava.jni/directbuffer.out
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/directbuffer.out 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,14 @@
+PASS: address of direct java.nio.ByteBuffer
+PASS: length of direct java.nio.ByteBuffer
+PASS: address of java.nio.CharBuffer view
+PASS: length of java.nio.CharBuffer view
+PASS: address of java.nio.DoubleBuffer view
+PASS: length of java.nio.DoubleBuffer view
+PASS: address of java.nio.FloatBuffer view
+PASS: length of java.nio.FloatBuffer view
+PASS: address of java.nio.IntBuffer view
+PASS: length of java.nio.IntBuffer view
+PASS: address of java.nio.LongBuffer view
+PASS: length of java.nio.LongBuffer view
+PASS: address of java.nio.ShortBuffer view
+PASS: length of java.nio.ShortBuffer view
Index: testsuite/libjava.jni/bytebuffer.c
===================================================================
RCS file: testsuite/libjava.jni/bytebuffer.c
diff -N testsuite/libjava.jni/bytebuffer.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/bytebuffer.c 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,62 @@
+#include "bytebuffer.h"
+
+static void
+test_buffer (JNIEnv *env, jobject buffer, const char *name)
+{
+ void *tmp = (*env)->GetDirectBufferAddress (env, buffer);
+
+ if (tmp == NULL)
+ printf ("PASS: address of %s\n", name);
+ else
+ printf ("FAIL: address of %s\n", name);
+
+ int tmplen = (*env)->GetDirectBufferCapacity (env, buffer);
+
+ if (tmplen == -1)
+ printf ("PASS: length of %s\n", name);
+ else
+ printf ("FAIL: length of %s\n", name);
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testByteBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.ByteBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testCharBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.CharBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testDoubleBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.DoubleBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testFloatBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.FloatBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testIntBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.IntBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testLongBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.LongBuffer");
+}
+
+JNIEXPORT void JNICALL
+Java_bytebuffer_testShortBuffer (JNIEnv *env, jclass k, jobject buffer)
+{
+ test_buffer (env, buffer, "java.nio.ShortBuffer");
+}
+
Index: testsuite/libjava.jni/bytebuffer.java
===================================================================
RCS file: testsuite/libjava.jni/bytebuffer.java
diff -N testsuite/libjava.jni/bytebuffer.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/bytebuffer.java 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,38 @@
+// Test to make sure JNI implementation catches exceptions.
+
+import java.nio.*;
+
+public class bytebuffer
+{
+ static
+ {
+ System.loadLibrary("bytebuffer");
+ }
+
+ public static native void testByteBuffer(ByteBuffer bb);
+ public static native void testCharBuffer(CharBuffer b);
+ public static native void testDoubleBuffer(DoubleBuffer b);
+ public static native void testFloatBuffer(FloatBuffer b);
+ public static native void testIntBuffer(IntBuffer b);
+ public static native void testLongBuffer(LongBuffer b);
+ public static native void testShortBuffer(ShortBuffer b);
+
+ public static void main(String[] args)
+ {
+ ByteBuffer bb = ByteBuffer.allocate(1024);
+ testByteBuffer(bb);
+ testCharBuffer(bb.asCharBuffer());
+ testDoubleBuffer(bb.asDoubleBuffer());
+ testFloatBuffer(bb.asFloatBuffer());
+ testIntBuffer(bb.asIntBuffer());
+ testLongBuffer(bb.asLongBuffer());
+ testShortBuffer(bb.asShortBuffer());
+
+ testCharBuffer(CharBuffer.allocate(1024));
+ testDoubleBuffer(DoubleBuffer.allocate(1024));
+ testFloatBuffer(FloatBuffer.allocate(1024));
+ testIntBuffer(IntBuffer.allocate(1024));
+ testLongBuffer(LongBuffer.allocate(1024));
+ testShortBuffer(ShortBuffer.allocate(1024));
+ }
+}
Index: testsuite/libjava.jni/bytebuffer.out
===================================================================
RCS file: testsuite/libjava.jni/bytebuffer.out
diff -N testsuite/libjava.jni/bytebuffer.out
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libjava.jni/bytebuffer.out 7 Jan 2005 05:37:14 -0000
@@ -0,0 +1,26 @@
+PASS: address of java.nio.ByteBuffer
+PASS: length of java.nio.ByteBuffer
+PASS: address of java.nio.CharBuffer
+PASS: length of java.nio.CharBuffer
+PASS: address of java.nio.DoubleBuffer
+PASS: length of java.nio.DoubleBuffer
+PASS: address of java.nio.FloatBuffer
+PASS: length of java.nio.FloatBuffer
+PASS: address of java.nio.IntBuffer
+PASS: length of java.nio.IntBuffer
+PASS: address of java.nio.LongBuffer
+PASS: length of java.nio.LongBuffer
+PASS: address of java.nio.ShortBuffer
+PASS: length of java.nio.ShortBuffer
+PASS: address of java.nio.CharBuffer
+PASS: length of java.nio.CharBuffer
+PASS: address of java.nio.DoubleBuffer
+PASS: length of java.nio.DoubleBuffer
+PASS: address of java.nio.FloatBuffer
+PASS: length of java.nio.FloatBuffer
+PASS: address of java.nio.IntBuffer
+PASS: length of java.nio.IntBuffer
+PASS: address of java.nio.LongBuffer
+PASS: length of java.nio.LongBuffer
+PASS: address of java.nio.ShortBuffer
+PASS: length of java.nio.ShortBuffer