stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5029431: (bf) Add absolute bulk put and get methods

Browse Source 
Reviewed-by: alanb, darcy, chegar, rriggs
This commit is contained in:
Brian Burkhalter 2019-02-20 10:57:22 -08:00
parent 2ee61b353b
commit 315b7d0399
12 changed files with 804 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,6 +29,7 @@ package java.nio;
import java.io.FileDescriptor;
import java.lang.ref.Reference;
import java.util.Objects;
import jdk.internal.misc.VM;
import jdk.internal.ref.Cleaner;
import sun.nio.ch.DirectBuffer;
@ -325,6 +326,40 @@ class Direct$Type$Buffer$RW$$BO$
#end[rw]
}
public $Type$Buffer get(int index, $type$[] dst, int offset, int length) {
#if[rw]
if (((long)length << $LG_BYTES_PER_VALUE$) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) {
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, dst.length);
long dstOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
try {
#if[!byte]
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(null,
ix(index),
dst,
dstOffset,
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(null,
ix(index),
dst,
dstOffset,
(long)length << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(this);
}
} else {
super.get(index, dst, offset, length);
}
return this;
#else[rw]
throw new ReadOnlyBufferException();
#end[rw]
}
#end[rw]
public $Type$Buffer put($type$ x) {
@ -440,6 +475,42 @@ class Direct$Type$Buffer$RW$$BO$
#end[rw]
}
public $Type$Buffer put(int index, $type$[] src, int offset, int length) {
#if[rw]
if (((long)length << $LG_BYTES_PER_VALUE$) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) {
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, src.length);
long srcOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
try {
#if[!byte]
if (order() != ByteOrder.nativeOrder())
UNSAFE.copySwapMemory(src,
srcOffset,
null,
ix(index),
(long)length << $LG_BYTES_PER_VALUE$,
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
UNSAFE.copyMemory(src,
srcOffset,
null,
ix(index),
(long)length << $LG_BYTES_PER_VALUE$);
} finally {
Reference.reachabilityFence(this);
}
} else {
super.put(index, src, offset, length);
}
return this;
#else[rw]
throw new ReadOnlyBufferException();
#end[rw]
}
public $Type$Buffer compact() {
#if[rw]
int pos = position();

22
src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,6 +38,8 @@ package java.nio;
#end[rw]
*/
import java.util.Objects;
class Heap$Type$Buffer$RW$
extends {#if[ro]?Heap}$Type$Buffer
{
@ -181,6 +183,13 @@ class Heap$Type$Buffer$RW$
return this;
}
public $Type$Buffer get(int index, $type$[] dst, int offset, int length) {
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, dst.length);
System.arraycopy(hb, ix(index), dst, offset, length);
return this;
}
public boolean isDirect() {
return false;
}
@ -250,6 +259,17 @@ class Heap$Type$Buffer$RW$
#end[rw]
}
public $Type$Buffer put(int index, $type$[] src, int offset, int length) {
#if[rw]
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, src.length);
System.arraycopy(src, offset, hb, ix(index), length);
return this;
#else[rw]
throw new ReadOnlyBufferException();
#end[rw]
}
public $Type$Buffer compact() {
#if[rw]
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());

186
src/java.base/share/classes/java/nio/X-Buffer.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ import java.util.stream.StreamSupport;
import java.util.stream.$Streamtype$Stream;
#end[streamableType]
import java.util.Objects;
import jdk.internal.util.ArraysSupport;
/**
@ -50,11 +51,11 @@ import jdk.internal.util.ArraysSupport;
* {@link #put($type$) <i>put</i>} methods that read and write
* single $type$s; </p></li>
*
* <li><p> Relative {@link #get($type$[]) <i>bulk get</i>}
* <li><p> Absolute and relative {@link #get($type$[]) <i>bulk get</i>}
* methods that transfer contiguous sequences of $type$s from this buffer
* into an array; {#if[!byte]?and}</p></li>
*
* <li><p> Relative {@link #put($type$[]) <i>bulk put</i>}
* <li><p> Absolute and relative {@link #put($type$[]) <i>bulk put</i>}
* methods that transfer contiguous sequences of $type$s from $a$
* $type$ array{#if[char]?,&#32;a&#32;string,} or some other $type$
* buffer into this buffer;{#if[!byte]?&#32;and} </p></li>
@ -436,7 +437,6 @@ public abstract class $Type$Buffer
* @return The number of characters added to the buffer, or
* -1 if this source of characters is at its end
* @throws IOException if an I/O error occurs
* @throws NullPointerException if target is null
* @throws ReadOnlyBufferException if target is a read only buffer
* @since 1.5
*/
@ -764,6 +764,89 @@ public abstract class $Type$Buffer
return get(dst, 0, dst.length);
}
/**
* Absolute bulk <i>get</i> method.
*
* <p> This method transfers {@code length} $type$s from this
* buffer into the given array, starting at the given index in this
* buffer and at the given offset in the array. The position of this
* buffer is unchanged.
*
* <p> An invocation of this method of the form
* <code>src.get(index,&nbsp;dst,&nbsp;offset,&nbsp;length)</code>
* has exactly the same effect as the following loop except that it first
* checks the consistency of the supplied parameters and it is potentially
* much more efficient:
*
* <pre>{@code
* for (int i = offset, j = index; i < offset + length; i++, j++)
* dst[i] = src.get(j);
* }</pre>
*
* @param index
* The index in this buffer from which the first $type$ will be
* read; must be non-negative and less than {@code limit()}
*
* @param dst
* The destination array
*
* @param offset
* The offset within the array of the first $type$ to be
* written; must be non-negative and less than
* {@code dst.length}
*
* @param length
* The number of $type$s to be written to the given array;
* must be non-negative and no larger than the smaller of
* {@code limit() - index} and {@code dst.length - offset}
*
* @return This buffer
*
* @throws IndexOutOfBoundsException
* If the preconditions on the {@code index}, {@code offset}, and
* {@code length} parameters do not hold
*
* @since 13
*/
public $Type$Buffer get(int index, $type$[] dst, int offset, int length) {
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, dst.length);
int end = offset + length;
for (int i = offset, j = index; i < end; i++, j++)
dst[i] = get(j);
return this;
}
/**
* Absolute bulk <i>get</i> method.
*
* <p> This method transfers $type$s from this buffer into the given
* destination array. The position of this buffer is unchanged. An
* invocation of this method of the form
* <code>src.get(index,&nbsp;dst)</code> behaves in exactly the same
* way as the invocation:
*
* <pre>
* src.get(index, dst, 0, dst.length) </pre>
*
* @param index
* The index in this buffer from which the first $type$ will be
* read; must be non-negative and less than {@code limit()}
*
* @param dst
* The destination array
*
* @return This buffer
*
* @throws IndexOutOfBoundsException
* If {@code index} is negative, not smaller than {@code limit()},
* or {@code limit() - index < dst.length}
*
* @since 13
*/
public $Type$Buffer get(int index, $type$[] dst) {
return get(index, dst, 0, dst.length);
}
// -- Bulk put operations --
@ -842,7 +925,7 @@ public abstract class $Type$Buffer
*
* <pre>{@code
* for (int i = off; i < off + len; i++)
* dst.put(a[i]);
* dst.put(src[i]);
* }</pre>
*
* except that it first checks that there is sufficient space in this
@ -853,12 +936,12 @@ public abstract class $Type$Buffer
*
* @param offset
* The offset within the array of the first $type$ to be read;
* must be non-negative and no larger than {@code array.length}
* must be non-negative and no larger than {@code src.length}
*
* @param length
* The number of $type$s to be read from the given array;
* must be non-negative and no larger than
* {@code array.length - offset}
* {@code src.length - offset}
*
* @return This buffer
*
@ -908,6 +991,95 @@ public abstract class $Type$Buffer
return put(src, 0, src.length);
}
/**
* Absolute bulk <i>put</i> method&nbsp;&nbsp;<i>(optional operation)</i>.
*
* <p> This method transfers {@code length} $type$s from the given
* array, starting at the given offset in the array and at the given index
* in this buffer. The position of this buffer is unchanged.
*
* <p> An invocation of this method of the form
* <code>dst.put(index,&nbsp;src,&nbsp;offset,&nbsp;length)</code>
* has exactly the same effect as the following loop except that it first
* checks the consistency of the supplied parameters and it is potentially
* much more efficient:
*
* <pre>{@code
* for (int i = offset, j = index; i < offset + length; i++, j++)
* dst.put(j, src[i]);
* }</pre>
*
* @param index
* The index in this buffer at which the first $type$ will be
* written; must be non-negative and less than {@code limit()}
*
* @param src
* The array from which $type$s are to be read
*
* @param offset
* The offset within the array of the first $type$ to be read;
* must be non-negative and less than {@code src.length}
*
* @param length
* The number of $type$s to be read from the given array;
* must be non-negative and no larger than the smaller of
* {@code limit() - index} and {@code src.length - offset}
*
* @return This buffer
*
* @throws IndexOutOfBoundsException
* If the preconditions on the {@code index}, {@code offset}, and
* {@code length} parameters do not hold
*
* @throws ReadOnlyBufferException
* If this buffer is read-only
*
* @since 13
*/
public $Type$Buffer put(int index, $type$[] src, int offset, int length) {
if (isReadOnly())
throw new ReadOnlyBufferException();
Objects.checkFromIndexSize(index, length, limit());
Objects.checkFromIndexSize(offset, length, src.length);
int end = offset + length;
for (int i = offset, j = index; i < end; i++, j++)
this.put(j, src[i]);
return this;
}
/**
* Absolute bulk <i>put</i> method&nbsp;&nbsp;<i>(optional operation)</i>.
*
* <p> This method copies $type$s into this buffer from the given source
* array. The position of this buffer is unchanged. An invocation of this
* method of the form <code>dst.put(index,&nbsp;src)</code>
* behaves in exactly the same way as the invocation:
*
* <pre>
* dst.put(index, src, 0, src.length); </pre>
*
* @param index
* The index in this buffer at which the first $type$ will be
* written; must be non-negative and less than {@code limit()}
*
* @param src
* The array from which $type$s are to be read
*
* @return This buffer
*
* @throws IndexOutOfBoundsException
* If {@code index} is negative, not smaller than {@code limit()},
* or {@code limit() - index < src.length}
*
* @throws ReadOnlyBufferException
* If this buffer is read-only
*
* @since 13
*/
public $Type$Buffer put(int index, $type$[] src) {
return put(index, src, 0, src.length);
}
#if[char]
/**

68
test/jdk/java/nio/Buffer/Basic-X.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class Basic$Type$
}
}
private static void absBulkGet($Type$Buffer b) {
int n = b.capacity();
int len = n - 7*2;
$type$[] a = new $type$[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)(($type$)ic(i)));
}
}
private static void relPut($Type$Buffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class Basic$Type$
}
}
private static void absBulkPutArray($Type$Buffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
$type$[] a = new $type$[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = ($type$)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset($Type$Buffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class Basic$Type$
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class Basic$Type$
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class Basic$Type$
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
#if[char]
bulkPutString(b);
@ -612,6 +648,26 @@ public class Basic$Type$
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, ($type$[])null, 0, 42));
$type$[] tmpa = new $type$[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class Basic$Type$
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put($Type$Buffer) should not change source position
final $Type$Buffer src = $Type$Buffer.allocate(1);
@ -903,6 +960,13 @@ public class Basic$Type$
b.position(6);
ck(b, b.subSequence(0,3).toString().equals("ghi"));
// absolute bulk get
char[] c = new char[end + 1 - (start - 1) + 1]; // [start - 1, end + 1]
b.limit(end + 2);
b.get(start - 1, c, 0, c.length);
for (int i = 0; i < c.length; i++)
ck(b, c[i], s.charAt(start - 1 + i));
// The index, relative to the position, must be non-negative and
// smaller than remaining().
catchIndexOutOfBounds(b, () -> b.charAt(-1));

8
test/jdk/java/nio/Buffer/Basic.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,9 +24,9 @@
/* @test
* @summary Unit test for buffers
* @bug 4413135 4414911 4416536 4416562 4418782 4471053 4472779 4490253 4523725
* 4526177 4463011 4660660 4661219 4663521 4782970 4804304 4938424 6231529
* 6221101 6234263 6535542 6591971 6593946 6795561 7190219 7199551 8065556
* 8149469
* 4526177 4463011 4660660 4661219 4663521 4782970 4804304 4938424 5029431
* 6231529 6221101 6234263 6535542 6591971 6593946 6795561 7190219 7199551
* 8065556 8149469
* @modules java.base/java.nio:open
* java.base/jdk.internal.misc
* @author Mark Reinhold

68
test/jdk/java/nio/Buffer/BasicByte.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicByte
}
}
private static void absBulkGet(ByteBuffer b) {
int n = b.capacity();
int len = n - 7*2;
byte[] a = new byte[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((byte)ic(i)));
}
}
private static void relPut(ByteBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicByte
}
}
private static void absBulkPutArray(ByteBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
byte[] a = new byte[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (byte)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(ByteBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicByte
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicByte
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicByte
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicByte
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (byte[])null, 0, 42));
byte[] tmpa = new byte[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicByte
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(ByteBuffer) should not change source position
final ByteBuffer src = ByteBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicByte

68
test/jdk/java/nio/Buffer/BasicChar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicChar
}
}
private static void absBulkGet(CharBuffer b) {
int n = b.capacity();
int len = n - 7*2;
char[] a = new char[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((char)ic(i)));
}
}
private static void relPut(CharBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicChar
}
}
private static void absBulkPutArray(CharBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
char[] a = new char[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (char)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(CharBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicChar
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicChar
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicChar
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
bulkPutString(b);
@ -612,6 +648,26 @@ public class BasicChar
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (char[])null, 0, 42));
char[] tmpa = new char[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicChar
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(CharBuffer) should not change source position
final CharBuffer src = CharBuffer.allocate(1);
@ -903,6 +960,13 @@ public class BasicChar
b.position(6);
ck(b, b.subSequence(0,3).toString().equals("ghi"));
// absolute bulk get
char[] c = new char[end + 1 - (start - 1) + 1]; // [start - 1, end + 1]
b.limit(end + 2);
b.get(start - 1, c, 0, c.length);
for (int i = 0; i < c.length; i++)
ck(b, c[i], s.charAt(start - 1 + i));
// The index, relative to the position, must be non-negative and
// smaller than remaining().
catchIndexOutOfBounds(b, () -> b.charAt(-1));

68
test/jdk/java/nio/Buffer/BasicDouble.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicDouble
}
}
private static void absBulkGet(DoubleBuffer b) {
int n = b.capacity();
int len = n - 7*2;
double[] a = new double[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((double)ic(i)));
}
}
private static void relPut(DoubleBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicDouble
}
}
private static void absBulkPutArray(DoubleBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
double[] a = new double[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (double)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(DoubleBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicDouble
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicDouble
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicDouble
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicDouble
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (double[])null, 0, 42));
double[] tmpa = new double[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicDouble
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(DoubleBuffer) should not change source position
final DoubleBuffer src = DoubleBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicDouble

68
test/jdk/java/nio/Buffer/BasicFloat.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicFloat
}
}
private static void absBulkGet(FloatBuffer b) {
int n = b.capacity();
int len = n - 7*2;
float[] a = new float[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((float)ic(i)));
}
}
private static void relPut(FloatBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicFloat
}
}
private static void absBulkPutArray(FloatBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
float[] a = new float[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (float)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(FloatBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicFloat
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicFloat
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicFloat
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicFloat
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (float[])null, 0, 42));
float[] tmpa = new float[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicFloat
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(FloatBuffer) should not change source position
final FloatBuffer src = FloatBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicFloat

68
test/jdk/java/nio/Buffer/BasicInt.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicInt
}
}
private static void absBulkGet(IntBuffer b) {
int n = b.capacity();
int len = n - 7*2;
int[] a = new int[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((int)ic(i)));
}
}
private static void relPut(IntBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicInt
}
}
private static void absBulkPutArray(IntBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
int[] a = new int[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (int)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(IntBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicInt
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicInt
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicInt
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicInt
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (int[])null, 0, 42));
int[] tmpa = new int[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicInt
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(IntBuffer) should not change source position
final IntBuffer src = IntBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicInt

68
test/jdk/java/nio/Buffer/BasicLong.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicLong
}
}
private static void absBulkGet(LongBuffer b) {
int n = b.capacity();
int len = n - 7*2;
long[] a = new long[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((long)ic(i)));
}
}
private static void relPut(LongBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicLong
}
}
private static void absBulkPutArray(LongBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
long[] a = new long[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (long)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(LongBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicLong
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicLong
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicLong
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicLong
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (long[])null, 0, 42));
long[] tmpa = new long[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicLong
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(LongBuffer) should not change source position
final LongBuffer src = LongBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicLong

68
test/jdk/java/nio/Buffer/BasicShort.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,18 @@ public class BasicShort
}
}
private static void absBulkGet(ShortBuffer b) {
int n = b.capacity();
int len = n - 7*2;
short[] a = new short[n + 7];
b.position(42);
b.get(7, a, 7, len);
ck(b, b.position() == 42);
for (int i = 0; i < len; i++) {
ck(b, (long)a[i + 7], (long)((short)ic(i)));
}
}
private static void relPut(ShortBuffer b) {
int n = b.capacity();
b.clear();
@ -136,6 +148,20 @@ public class BasicShort
}
}
private static void absBulkPutArray(ShortBuffer b) {
int n = b.capacity();
b.clear();
int lim = n - 7;
int len = lim - 7;
b.limit(lim);
short[] a = new short[len + 7];
for (int i = 0; i < len; i++)
a[i + 7] = (short)ic(i);
b.position(42);
b.put(7, a, 7, len);
ck(b, b.position() == 42);
}
//6231529
private static void callReset(ShortBuffer b) {
b.position(0);
@ -452,6 +478,10 @@ public class BasicShort
fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
}
private static void catchNullArgument(Buffer b, Runnable thunk) {
tryCatch(b, NullPointerException.class, thunk);
}
private static void catchIllegalArgument(Buffer b, Runnable thunk) {
tryCatch(b, IllegalArgumentException.class, thunk);
}
@ -476,7 +506,10 @@ public class BasicShort
if (ex.isAssignableFrom(x.getClass())) {
caught = true;
} else {
fail(x.getMessage() + " not expected");
String s = x.getMessage();
if (s == null)
s = x.getClass().getName();
fail(s + " not expected");
}
}
if (!caught) {
@ -513,6 +546,9 @@ public class BasicShort
bulkPutBuffer(b);
relGet(b);
absBulkPutArray(b);
absBulkGet(b);
@ -612,6 +648,26 @@ public class BasicShort
}
}
// Exceptions in absolute bulk operations
catchNullArgument(b, () -> b.get(7, null, 0, 42));
catchNullArgument(b, () -> b.put(7, (short[])null, 0, 42));
short[] tmpa = new short[42];
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
// Values
b.clear();
@ -819,6 +875,7 @@ public class BasicShort
catchReadOnlyBuffer(b, () -> absPut(rb));
catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
// put(ShortBuffer) should not change source position
final ShortBuffer src = ShortBuffer.allocate(1);
@ -920,6 +977,13 @@ public class BasicShort