re PR libgcj/18115 (JNI nio buffer functions only work with byte buffers)

2005-01-07  Michael Koch  <konqueror@gmx.de>

	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

17 files changed, 319 insertions, 6 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d3d4191..f60f481 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,26 @@
+2005-01-07  Michael Koch  <konqueror@gmx.de>
+
+	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.
+
 2005-01-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/zip/ZipEntry.java (setCompressedSize): Allow any
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 a9d086d2..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);
   }
 
   /**
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 6138334..2f4c3e4 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -41,6 +41,7 @@ details.  */
 #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 @@ static void * JNICALL
 _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();
 }
 
 
diff --git a/libjava/testsuite/libjava.jni/bytebuffer.c b/libjava/testsuite/libjava.jni/bytebuffer.c
new file mode 100644
index 0000000..146c6a8
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/bytebuffer.c
@@ -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");
+}
+
diff --git a/libjava/testsuite/libjava.jni/bytebuffer.java b/libjava/testsuite/libjava.jni/bytebuffer.java
new file mode 100644
index 0000000..0e54112
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/bytebuffer.java
@@ -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));
+  }
+}
diff --git a/libjava/testsuite/libjava.jni/bytebuffer.out b/libjava/testsuite/libjava.jni/bytebuffer.out
new file mode 100644
index 0000000..5af92e2
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/bytebuffer.out
@@ -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
diff --git a/libjava/testsuite/libjava.jni/directbuffer.c b/libjava/testsuite/libjava.jni/directbuffer.c
new file mode 100644
index 0000000..3d32aba
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/directbuffer.c
@@ -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);
+}
+
diff --git a/libjava/testsuite/libjava.jni/directbuffer.java b/libjava/testsuite/libjava.jni/directbuffer.java
new file mode 100644
index 0000000..ee844b9
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/directbuffer.java
@@ -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);
+  }
+}
diff --git a/libjava/testsuite/libjava.jni/directbuffer.out b/libjava/testsuite/libjava.jni/directbuffer.out
new file mode 100644
index 0000000..c1404b9
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/directbuffer.out
@@ -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