JVM VarHandle for short, char

Author: magicprinc

src/main/java/com/trivago/fastutilconcurrentwrapper/io/BAIS.java

@@ -160,18 +160,24 @@ public boolean readBoolean () {
 	/// @see DataInputStream#readShort
 	/// (short)((read() << 8)|(read() & 0xFF))
 	@Override
-	public short readShort() {
-		return (short)((read() << 8)|(read() & 0xFF));
+	public short readShort () {
+		short v = JBytes.DirectByteArrayAccess.getShort(buf, pos);
+		pos += 2;
+		return v;
 	}
 
 	@Override
 	public int readUnsignedShort() {
-		return ((read() & 0xFF) << 8)|(read() & 0xFF);
+		int v = JBytes.DirectByteArrayAccess.getUnsignedShort(buf, pos);
+		pos += 2;
+		return v;
 	}
 
 	@Override
 	public char readChar() {
-		return (char)(((read() & 0xFF) << 8)|(read() & 0xFF));
+		char v = JBytes.DirectByteArrayAccess.getChar(buf, pos);
+		pos += 2;
+		return v;
 	}
 
 	@Override
@@ -205,12 +211,16 @@ public long readLong () {
 
 	@Override
 	public float readFloat () {
-		return Float.intBitsToFloat(readInt());
+		float v = JBytes.DirectByteArrayAccess.getFloat(buf, pos);
+		pos += 4;
+		return v;
 	}
 
 	@Override
 	public double readDouble () {
-		return Double.longBitsToDouble(readLong());
+		double v = JBytes.DirectByteArrayAccess.getDouble(buf, pos);
+		pos += 8;
+		return v;
 	}
 
 	@Override  @Deprecated

src/main/java/com/trivago/fastutilconcurrentwrapper/io/BAOS.java

@@ -194,15 +194,19 @@ public void writeByte(int v) {
 	}
 
 	@Override
-	public void writeShort(int v) {
-		write(v >> 8);
-		write(v);
+	public void writeShort (int v) {
+		grow(2);
+		JBytes.DirectByteArrayAccess.setShort(buf, position, (short) v);
+		position += 2;
+		if (count < position) count = position;
 	}
 
 	@Override
-	public void writeChar(int v) {
-		write(v >> 8);
-		write(v);
+	public void writeChar (int v) {
+		grow(2);
+		JBytes.DirectByteArrayAccess.setChar(buf, position, (char) v);
+		position += 2;
+		if (count < position) count = position;
 	}
 
 	@Override
@@ -234,12 +238,18 @@ public void writeLong (long v) {
 
 	@Override
 	public void writeFloat(float v) {
-		writeInt(Float.floatToIntBits(v));
+		grow(4);
+		JBytes.DirectByteArrayAccess.setFloat(buf, position, v);
+		position += 4;
+		if (count < position) count = position;
 	}
 
 	@Override
 	public void writeDouble(double v) {
-		writeLong(Double.doubleToLongBits(v));
+		grow(8);
+		JBytes.DirectByteArrayAccess.setDouble(buf, position, v);
+		position += 8;
+		if (count < position) count = position;
 	}
 
 	/**

src/test/java/com/trivago/fastutilconcurrentwrapper/io/BAOSTest.java

@@ -998,6 +998,8 @@ void _oos () throws IOException, ClassNotFoundException {
 	}
 
 	/// 500k: 5_760 ms, op/s=86_802
+	/// VarHandle int&long: 2_333 ms, op/s=214_281
+	/// all: 2_281, op/s=219_195
 	@Test
 	void _benchmark () {
 		IntStream.range(0, 2).forEach(__->{

src/test/java/com/trivago/fastutilconcurrentwrapper/io/FastByteArrayStreamsTest.java

@@ -154,9 +154,12 @@ void testEOF () throws UTFDataFormatException {
 		assertEquals(-1, r.readByte());
 		assertEquals(0xff, r.readUnsignedByte());
 		assertTrue(r.readBoolean());//?
-		assertEquals(-1, r.readShort());
-		assertEquals(0xFFFF, r.readUnsignedShort());
-		assertEquals(0xFFFF, r.readChar());
+		//assertEquals(-1, r.readShort());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readShort);
+		//assertEquals(0xFFFF, r.readUnsignedShort());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readUnsignedShort);
+		//assertEquals(0xFFFF, r.readChar());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readChar);
 		//assertEquals(-1, r.readInt());
 		assertThrows(ArrayIndexOutOfBoundsException.class, r::readInt);
 		//assertEquals(-1, r.readLong());