Changeset 15383

Timestamp:

09/26/20 07:32:03 (3 years ago)

Author:

Mark Evenson

Message:

Fixes for allocation of arrays via :nio-buffer

Fix capacity allocation for (or (unsigned-byte 16) (unsigned-byte 32))
arrays created via an nio-buffer.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• BasicVector_CharBuffer.java (modified) (1 diff)
• BasicVector_IntBuffer.java (modified) (1 diff)
• make_array.java (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/BasicVector_CharBuffer.java

@@ -77 +77 @@
     elements = buffer.asCharBuffer();
     this.directAllocation = directAllocation;
-    capacity = ((java.nio.Buffer)buffer).limit();
+    capacity = ((java.nio.Buffer)buffer).limit() / 2;
   }
 

trunk/abcl/src/org/armedbear/lisp/BasicVector_IntBuffer.java

@@ -80 +80 @@
     this.directAllocation = directAllocation;
     elements = buffer.asIntBuffer();
-    capacity = ((java.nio.Buffer)buffer).limit();
+    capacity = ((java.nio.Buffer)buffer).limit() / 4;
   }
 
   public BasicVector_IntBuffer(IntBuffer buffer) {
+    this(buffer, false);
+  }
+
+  public BasicVector_IntBuffer(IntBuffer buffer, boolean directAllocation) {
     this.directAllocation = directAllocation;
     elements = buffer;

trunk/abcl/src/org/armedbear/lisp/make_array.java

@@ -193 +193 @@
                  && fillPointer == NIL && adjustable == NIL) {
         if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
-          v = new BasicVector_CharBuffer(size, directAllocation);
+          if (!nioBuffer.equals(NIL)) {
+            Object o = ((JavaObject)nioBuffer).getObject();
+            if (o instanceof java.nio.CharBuffer) {
+              v = new BasicVector_CharBuffer((java.nio.CharBuffer) o, directAllocation);
+            } else if (o instanceof java.nio.ByteBuffer) {
+              v = new BasicVector_CharBuffer((java.nio.ByteBuffer)o, directAllocation); // FIXME warn on coercion?
+            } else {
+              return type_error(nioBuffer, JavaObject.getInstance(java.nio.CharBuffer.class));
+            }
+          } else {
+            v = new BasicVector_CharBuffer(size, directAllocation);
+          }
         } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
           v = new BasicVector_UnsignedByte16(size);
@@ -200 +211 @@
       } else if (upgradedType.equal(UNSIGNED_BYTE_32)) {
         if (fillPointer != NIL || adjustable != NIL) {
-          v = new ComplexVector_UnsignedByte32(size);
-        } else {
           if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
-            v = new BasicVector_IntBuffer(size, directAllocation);
+            v = new ComplexVector_IntBuffer(size);
+          } else {
+            v = new ComplexVector_UnsignedByte32(size);
+          }
+        } else {
+          if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+            if (!nioBuffer.equals(NIL)) {
+              Object o = ((JavaObject)nioBuffer).getObject();
+              if (o instanceof java.nio.IntBuffer) {
+                v = new BasicVector_IntBuffer((java.nio.IntBuffer)o, directAllocation);
+              } else if (o instanceof java.nio.ByteBuffer) {
+                v = new BasicVector_IntBuffer((java.nio.ByteBuffer)o, directAllocation);
+              } else {
+                return type_error(nioBuffer, JavaObject.getInstance(java.nio.IntBuffer.class));
+              }
+            } else {
+              v = new BasicVector_IntBuffer(size, directAllocation);
+            }
           } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
             v = new BasicVector_UnsignedByte32(size);
@@ -220 +246 @@
         defaultInitialElement = NIL;
       }
+      
       if (nioBuffer != NIL) {
-        // v is fine

+        // v should have been allocated with a nioBuffer reference

         ;
       } else if (initialElementProvided != NIL) {